diff options
| author | Erik Kundiman <erik@megapahit.org> | 2026-04-23 07:56:12 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2026-04-23 07:56:12 +0800 |
| commit | 4c61b111b7b47e7ce2520f8bb362b90547eb85d6 (patch) | |
| tree | cdc1a65db64edfbd8771b49ec19bb92a56887a0a /indra/llrender/llfontgl.cpp | |
| parent | c5054eeb37e379f3b19b63f5f4ff28095e05c3cd (diff) | |
| parent | 84f50b9deccf239e59a7d6391ae4cb5d77aa4d54 (diff) | |
Merge tag 'Second_Life_Release#84f50b9d-26.2' into 2026.02
Diffstat (limited to 'indra/llrender/llfontgl.cpp')
| -rw-r--r-- | indra/llrender/llfontgl.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp index b2ca9cce75..5d99c35047 100644 --- a/indra/llrender/llfontgl.cpp +++ b/indra/llrender/llfontgl.cpp @@ -1115,7 +1115,14 @@ LLFontGL* LLFontGL::getFontSansSerifSmallItalic() //static LLFontGL* LLFontGL::getFontSansSerif() { - static LLFontGL* fontp = getFont(LLFontDescriptor("SansSerif","Medium",0)); + static LLFontGL* fontp = getFont(LLFontDescriptor("SansSerif","Small",0)); + return fontp; +} + +// static +LLFontGL* LLFontGL::getFontSansSerifMedium() +{ + static LLFontGL* fontp = getFont(LLFontDescriptor("SansSerif", "Medium", 0)); return fontp; } |