Adds ability for user to use their own custom font files

indra/llrender/llfontfreetype.cpp

@@ -462,6 +462,46 @@ S32 LLFontFreetype::getNumFaces(const std::string& filename)
     return num_faces;
 }
 
+LLFontFreetype::FaceInfo LLFontFreetype::probeFaceInfo(const std::string& filename)
+{
+    FaceInfo info;
+
+    auto contents = LLFile::getContents(filename);
+    if (contents.empty())
+        return info;
+
+    FT_Open_Args openArgs;
+    memset(&openArgs, 0, sizeof(openArgs));
+    openArgs.memory_base = reinterpret_cast<const FT_Byte*>(contents.data());
+    openArgs.memory_size = static_cast<FT_Long>(contents.size());
+    openArgs.flags = FT_OPEN_MEMORY;
+
+    FT_Face probe = nullptr;
+    if (FT_Open_Face(gFTLibrary, &openArgs, 0, &probe) != 0)
+        return info;
+
+    info.family = probe->family_name ? probe->family_name : "";
+
+    info.bold   = (probe->style_flags & FT_STYLE_FLAG_BOLD) != 0;
+    info.italic = (probe->style_flags & FT_STYLE_FLAG_ITALIC) != 0;
+    if (!info.bold || !info.italic)
+    {
+        std::string style = probe->style_name ? probe->style_name : "";
+        LLStringUtil::toLower(style);
+        if (style.find("bold") != std::string::npos)
+            info.bold = true;
+        if (style.find("italic") != std::string::npos || style.find("oblique") != std::string::npos)
+            info.italic = true;
+    }
+
+    info.fixed_width = (probe->face_flags & FT_FACE_FLAG_FIXED_WIDTH) != 0;
+    info.has_color   = FT_HAS_COLOR(probe);
+    info.valid       = !info.family.empty();
+
+    FT_Done_Face(probe);
+    return info;
+}
+
 void LLFontFreetype::addFallbackFont(const LLPointer<LLFontFreetype>& fallback_font,
                                      const char_functor_t& functor) const
 {

indra/llrender/llfontfreetype.h

@@ -158,6 +158,18 @@ class LLFontFreetype : public LLRefCount
     // touches no instance state, so callers don't need a live freetype.
     static S32 getNumFaces(const std::string& filename);
 
+    struct FaceInfo
+    {
+        bool        valid       = false;
+        std::string family;
+        bool        bold        = false;
+        bool        italic      = false;
+        bool        fixed_width = false;
+        bool        has_color   = false;
+    };
+    // Probe the first face of a font file.
+    static FaceInfo probeFaceInfo(const std::string& filename);
+
     typedef std::function<bool(llwchar)> char_functor_t;
     void addFallbackFont(const LLPointer<LLFontFreetype>& fallback_font, const char_functor_t& functor = nullptr) const;
     typedef std::pair<LLPointer<LLFontFreetype>, char_functor_t> fallback_font_t;

indra/llrender/llfontgl.cpp

@@ -2436,6 +2436,32 @@ std::string LLFontGL::getFontPathLocal()
     return local_path;
 }
 
+// static
+std::string LLFontGL::getFontPathUser()
+{
+    if (gDirUtilp == nullptr)
+        return {};
+
+    const std::string user_app_dir = gDirUtilp->getOSUserAppDir();
+    if (user_app_dir.empty())
+        return {};
+
+    return gDirUtilp->add(user_app_dir, "fonts") + gDirUtilp->getDirDelimiter();
+}
+
+// static
+std::string LLFontGL::getImportedFontsOverlayPath()
+{
+    if (gDirUtilp == nullptr)
+        return {};
+
+    const std::string user_app_dir = gDirUtilp->getOSUserAppDir();
+    if (user_app_dir.empty())
+        return {};
+
+    return gDirUtilp->add(gDirUtilp->add(user_app_dir, "fonts"), "imported_fonts.xml");
+}
+
 void LLFontGL::renderTriangle(LLVector4a* vertex_out, LLVector2* uv_out, LLColor4U* colors_out, const LLRectf& screen_rect, const LLRectf& uv_rect, const LLColor4U& color, F32 slant_amt) const
 {
     // slant_amt shifts the bottom edge horizontally relative to the top

indra/llrender/llfontgl.h

@@ -384,6 +384,8 @@ class LLFontGL
 
     static std::string getFontPathLocal();
     static std::string getFontPathSystem();
+    static std::string getFontPathUser();
+    static std::string getImportedFontsOverlayPath();
 
     // The shadow of the UI transform, kept on the CPU for the three things
     // that need to know where a local coordinate lands without asking the

indra/llrender/llfontregistry.cpp

@@ -348,6 +348,22 @@ bool LLFontRegistry::parseFontInfo(const std::string& xml_filename, const LLSD&
         success = parse_single_fonts_file(this, path) || success;
     }
 
+    {
+        const std::string overlay = LLFontGL::getImportedFontsOverlayPath();
+        if (!overlay.empty() && gDirUtilp->fileExists(overlay))
+        {
+            if (!parse_single_fonts_file(this, overlay))
+            {
+                LL_WARNS() << "fonts.xml: failed to parse imported-fonts overlay "
+                           << overlay << LL_ENDL;
+            }
+            else
+            {
+                success = true;
+            }
+        }
+    }
+
     // Resolve cross-family <use> and per-family inherit="true" once across
     // the merged registry, after all skinned fonts.xml files have been read.
     // Doing this per-file would double-append references for entries that
@@ -1697,6 +1713,12 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc)
     bool is_first_found = true;
 
     string_vec_t font_search_paths;
+    // Imported fonts first so they can shadow bundled ones.
+    const std::string user_font_path = LLFontGL::getFontPathUser();
+    if (!user_font_path.empty())
+    {
+        font_search_paths.push_back(user_font_path);
+    }
     font_search_paths.push_back(LLFontGL::getFontPathLocal());
     font_search_paths.push_back(LLFontGL::getFontPathSystem());
 #if LL_DARWIN

indra/newview/CMakeLists.txt

@@ -158,6 +158,7 @@ if(AL_BUILD_VIEWER)
     alfloaterexploresounds.cpp
     alfloaterfeedback.cpp
     alfloaterfeedbackpreview.cpp
+    alfloaterfontreset.cpp
     alfloatergenerictext.cpp
     alfloatergroupprofile.cpp
     alfloaterlightbox.cpp
@@ -169,6 +170,7 @@ if(AL_BUILD_VIEWER)
     alfloatersceneexplorerfilters.cpp
     alfloaterscopes.cpp
     alfloatertransactionlog.cpp
+    alimportedfonts.cpp
     alrenderisolation.cpp
     alrendersizeoverride.cpp
     alsceneexplorerpredicate.cpp
@@ -1032,6 +1034,7 @@ if(AL_BUILD_VIEWER)
     alfloaterexploresounds.h
     alfloaterfeedback.h
     alfloaterfeedbackpreview.h
+    alfloaterfontreset.h
     alfloatergenerictext.h
     alfloatergroupprofile.h
     alfloaterlightbox.h
@@ -1043,6 +1046,7 @@ if(AL_BUILD_VIEWER)
     alfloatersceneexplorerfilters.h
     alfloaterscopes.h
     alfloatertransactionlog.h
+    alimportedfonts.h
     alrenderisolation.h
     alrendersizeoverride.h
     alsceneexplorerpredicate.h

indra/newview/alfloaterfontreset.cpp

@@ -0,0 +1,71 @@
+/**
+ * @file alfloaterfontreset.cpp
+ * @brief Confirmation dialog for the "reset fonts to defaults" recovery action.
+ *
+ * $LicenseInfo:firstyear=2026&license=viewerlgpl$
+ * Alchemy Viewer Source Code
+ * Copyright (C) 2026, Rye <rye@alchemyviewer.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "alfloaterfontreset.h"
+
+#include "alimportedfonts.h"
+#include "llbutton.h"
+#include "llfloaterpreference.h"
+#include "llfloaterreg.h"
+
+ALFloaterFontReset::ALFloaterFontReset(const LLSD& key)
+:   LLFloater(key)
+{
+}
+
+bool ALFloaterFontReset::postBuild()
+{
+    childSetAction("reset_btn", boost::bind(&ALFloaterFontReset::onReset, this));
+    childSetAction("cancel_btn", boost::bind(&ALFloaterFontReset::onCancel, this));
+    return true;
+}
+
+void ALFloaterFontReset::onOpen(const LLSD& key)
+{
+    // Focus Cancel so Enter can't clear fonts by accident.
+    if (LLUICtrl* cancel = getChild<LLUICtrl>("cancel_btn"))
+    {
+        cancel->setFocus(true);
+    }
+}
+
+void ALFloaterFontReset::onReset()
+{
+    ALImportedFonts::resetOverrides();
+    LLFloaterPreference::scheduleFontDropdownRefresh();
+    closeFloater();
+}
+
+void ALFloaterFontReset::onCancel()
+{
+    closeFloater();
+}
+
+// static
+void ALFloaterFontReset::showConfirm()
+{
+    LLFloaterReg::showInstance("font_reset");
+}

indra/newview/alfloaterfontreset.h

@@ -0,0 +1,46 @@
+/**
+ * @file alfloaterfontreset.h
+ * @brief Confirmation dialog for resetting UI fonts to defaults.
+ *
+ * $LicenseInfo:firstyear=2026&license=viewerlgpl$
+ * Alchemy Viewer Source Code
+ * Copyright (C) 2026, Rye <rye@alchemyviewer.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * $/LicenseInfo$
+ */
+
+#ifndef AL_ALFLOATERFONTRESET_H
+#define AL_ALFLOATERFONTRESET_H
+
+#include "llfloater.h"
+
+class ALFloaterFontReset final : public LLFloater
+{
+public:
+    ALFloaterFontReset(const LLSD& key);
+    ~ALFloaterFontReset() override = default;
+
+    static void showConfirm();
+
+    bool postBuild() override;
+    void onOpen(const LLSD& key) override;
+
+private:
+    void onReset();
+    void onCancel();
+};
+
+#endif // AL_ALFLOATERFONTRESET_H