diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-03-06 15:23:54 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-06 15:23:54 -0500 |
| commit | e6927d8a079f81522e7dde9b1c67035171f84c93 (patch) | |
| tree | a5335524e579d1ad478f1b723215673a55cc51dd /indra/llui/llstyle.cpp | |
| parent | 5029f0322f264e17f7509952f7bf9812db17a9ec (diff) | |
| parent | 42ceac9695f7e098f15264977396a939c8ddfd23 (diff) | |
Merge pull request #3304 from secondlife/release/2024.12-ForeverFPS
2024.12 ForeverFPS
Diffstat (limited to 'indra/llui/llstyle.cpp')
| -rw-r--r-- | indra/llui/llstyle.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/llui/llstyle.cpp b/indra/llui/llstyle.cpp index df4b0ef6a0..4714665e8b 100644 --- a/indra/llui/llstyle.cpp +++ b/indra/llui/llstyle.cpp @@ -39,7 +39,7 @@ LLStyle::Params::Params() readonly_color("readonly_color", LLColor4::black), selected_color("selected_color", LLColor4::black), alpha("alpha", 1.f), - font("font", LLFontGL::getFontMonospace()), + font("font", LLStyle::getDefaultFont()), image("image"), link_href("href"), is_link("is_link") @@ -70,6 +70,11 @@ const LLFontGL* LLStyle::getFont() const return mFont; } +const LLFontGL* LLStyle::getDefaultFont() +{ + return LLFontGL::getFontMonospace(); +} + void LLStyle::setLinkHREF(const std::string& href) { mLink = href; |