Merge pull request #4700 from secondlife/geenz/2025.07-develop

Geenz/2025.07 -> develop

1 files changed, 13 insertions, 10 deletions

diff --git a/indra/llrender/llfontfreetype.h b/indra/llrender/llfontfreetype.h
index 783bf4a4b3..a9b3a944ee 100644
--- a/indra/llrender/llfontfreetype.h
+++ b/indra/llrender/llfontfreetype.h
@@ -43,15 +43,28 @@ typedef struct FT_FaceRec_* LLFT_Face;
 struct FT_StreamRec_;
 typedef struct FT_StreamRec_ LLFT_Stream;
 
+namespace ll
+{
+    namespace fonts
+    {
+        class LoadedFont;
+    }
+}
+
 class LLFontManager
 {
 public:
     static void initClass();
     static void cleanupClass();
 
+    U8 const *loadFont( std::string const &aFilename, long &a_Size );
+
 private:
     LLFontManager();
     ~LLFontManager();
+
+    void unloadAllFonts();
+    std::map< std::string, std::shared_ptr<ll::fonts::LoadedFont> > m_LoadedFonts;
 };
 
 struct LLFontGlyphInfo
@@ -90,11 +103,6 @@ public:
 
     S32 getNumFaces(const std::string& filename);
 
-#ifdef LL_WINDOWS
-    S32 ftOpenFace(const std::string& filename, S32 face_n);
-    void clearFontStreams();
-#endif
-
     typedef std::function<bool(llwchar)> char_functor_t;
     void addFallbackFont(const LLPointer<LLFontFreetype>& fallback_font, const char_functor_t& functor = nullptr);
 
@@ -170,11 +178,6 @@ private:
 
     LLFT_Face mFTFace;
 
-#ifdef LL_WINDOWS
-    llifstream *pFileStream;
-    LLFT_Stream *pFtStream;
-#endif
-
     bool mIsFallback;
     typedef std::pair<LLPointer<LLFontFreetype>, char_functor_t> fallback_font_t;
     typedef std::vector<fallback_font_t> fallback_font_vector_t;