summaryrefslogtreecommitdiff
path: root/indra/llui/llpanel.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2019-08-12 09:58:08 -0400
committerNat Goodspeed <nat@lindenlab.com>2019-08-12 09:58:08 -0400
commit5a72d34b7676031da35f93c91eda3eab01085aff (patch)
tree4677bc0b7330af7ff142d286eb4feee5126a8d7e /indra/llui/llpanel.cpp
parentf0fa4f94a5400fe5d21cf5bf7570129916bf9787 (diff)
parent98be6e141c1232bad28cc115bc7092f175b18809 (diff)
Automated merge with file:///Users/nat/linden/viewer-catch
Diffstat (limited to 'indra/llui/llpanel.cpp')
-rw-r--r--indra/llui/llpanel.cpp4
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;
}