diff options
author | Euclid Linden <euclid@lindenlab.com> | 2021-07-19 22:24:33 +0000 |
---|---|---|
committer | Euclid Linden <euclid@lindenlab.com> | 2021-07-19 22:24:33 +0000 |
commit | 1b15b8cda7853e55a91fd0140311ed69f3cca677 (patch) | |
tree | 33edfb0495161594a50dcfbed3a3f42e7fde9143 /indra/llui/llconsole.cpp | |
parent | dc14dbf54d332a6cdc43002bb71ed71e9a473647 (diff) | |
parent | 4c849ba91363f82da05cce1221b04075a6ca72af (diff) |
Merged in DV528-merge-6.4.22 (pull request #630)
DRTVWR-528 merge up to v 6.4.22
Diffstat (limited to 'indra/llui/llconsole.cpp')
-rw-r--r-- | indra/llui/llconsole.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/llconsole.cpp b/indra/llui/llconsole.cpp index 7817d99aef..8fc2978bdd 100644 --- a/indra/llui/llconsole.cpp +++ b/indra/llui/llconsole.cpp @@ -180,7 +180,9 @@ void LLConsole::draw() LLUIImagePtr imagep = LLUI::getUIImage("transparent"); - F32 console_opacity = llclamp(LLUI::getInstance()->mSettingGroups["config"]->getF32("ConsoleBackgroundOpacity"), 0.f, 1.f); + static LLCachedControl<F32> console_bg_opacity(*LLUI::getInstance()->mSettingGroups["config"], "ConsoleBackgroundOpacity", 0.7f); + F32 console_opacity = llclamp(console_bg_opacity(), 0.f, 1.f); + LLColor4 color = LLUIColorTable::instance().getColor("ConsoleBackground"); color.mV[VALPHA] *= console_opacity; |