diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2025-02-19 17:29:48 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2025-02-19 17:29:48 +0200 |
| commit | 847fd636cd5c1ae63dabfa76c3d1d0df36ddb9fa (patch) | |
| tree | 6c9dcef59ca8b809ee87d565524f0262580c7bec /indra/llui/llstyle.cpp | |
| parent | 483e85cbf31e08e3692d2fb267bdaacdd0ed38a4 (diff) | |
| parent | 8c1f00eebc6863c39d0143aeb7e37c68459d454f (diff) | |
Merge branch release/2025.03
# Conflicts:
# indra/newview/llmeshrepository.cpp
# indra/newview/llmeshrepository.h
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; |