diff options
author | Dave Houlton <euclid@lindenlab.com> | 2019-11-13 16:46:27 -0700 |
---|---|---|
committer | Dave Houlton <euclid@lindenlab.com> | 2019-11-13 16:46:27 -0700 |
commit | dc1453af9c474c67749aded576c11dff3afdd444 (patch) | |
tree | bff4d5bfca6eb036339c30429ef08704d0bb68cb /indra/llui/llpanel.cpp | |
parent | 3dfdb2f6e8be4fb2a08102847520585dc1d8fd7d (diff) | |
parent | 78bdf57ad6610b34389226bf941ba736ca0c2225 (diff) |
Merge in from viewer-release 6.3.5
Diffstat (limited to 'indra/llui/llpanel.cpp')
-rw-r--r-- | indra/llui/llpanel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llpanel.cpp b/indra/llui/llpanel.cpp index ee90574161..00da0f5fec 100644 --- a/indra/llui/llpanel.cpp +++ b/indra/llui/llpanel.cpp @@ -609,7 +609,7 @@ std::string LLPanel::getString(const std::string& name, const LLStringUtil::form return formatted_string.getString(); } std::string err_str("Failed to find string " + name + " in panel " + getName()); //*TODO: Translate - if(LLUI::sSettingGroups["config"]->getBOOL("QAMode")) + if(LLUI::getInstance()->mSettingGroups["config"]->getBOOL("QAMode")) { LL_ERRS() << err_str << LL_ENDL; } @@ -628,7 +628,7 @@ std::string LLPanel::getString(const std::string& name) const return found_it->second; } std::string err_str("Failed to find string " + name + " in panel " + getName()); //*TODO: Translate - if(LLUI::sSettingGroups["config"]->getBOOL("QAMode")) + if(LLUI::getInstance()->mSettingGroups["config"]->getBOOL("QAMode")) { LL_ERRS() << err_str << LL_ENDL; } |