diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2026-05-20 11:57:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-05-20 11:57:48 -0400 |
| commit | 9c2ee024bef564ebb6e2e8942b43ffae1d99232c (patch) | |
| tree | 6c6c6bebf982cda7b056156fb206378dbc443fe7 /indra/llrender/llfontgl.h | |
| parent | 491b0b32c74e2186dd34f9be8513bb08d390dfe2 (diff) | |
| parent | 3f82abe033887ff690398381563100735e008df4 (diff) | |
Merge pull request #5843 from secondlife/geenz/26.2-to-26.3
26.2 to 26.3
Diffstat (limited to 'indra/llrender/llfontgl.h')
| -rw-r--r-- | indra/llrender/llfontgl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llrender/llfontgl.h b/indra/llrender/llfontgl.h index 1c8e036f58..3b82d8e43d 100644 --- a/indra/llrender/llfontgl.h +++ b/indra/llrender/llfontgl.h @@ -87,7 +87,7 @@ public: void destroyGL(); - bool loadFace(const std::string& filename, F32 point_size, const F32 vert_dpi, const F32 horz_dpi, bool is_fallback, S32 face_n); + bool loadFace(const std::string& filename, F32 point_size, const F32 vert_dpi, const F32 horz_dpi, S32 weight, bool is_fallback, S32 face_n, EFontHinting hinting, S32 flags); S32 getNumFaces(const std::string& filename); S32 getCacheGeneration() const; @@ -204,6 +204,7 @@ public: static LLFontGL* getFontSansSerifSmallBold(); static LLFontGL* getFontSansSerifSmallItalic(); static LLFontGL* getFontSansSerif(); + static LLFontGL* getFontSansSerifMedium(); static LLFontGL* getFontSansSerifBig(); static LLFontGL* getFontSansSerifHuge(); static LLFontGL* getFontSansSerifBold(); |