aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llui/llpanel.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:37 -0500
committerJacek Antonelli2008-08-15 23:45:37 -0500
commit31ba05810c641f14e8ab5da8ad2aaf527779f6c1 (patch)
treec4b8d635dfb657fa4cfee7c285f8cadbf24afa90 /linden/indra/llui/llpanel.cpp
parentSecond Life viewer sources 1.19.1.1 (diff)
downloadmeta-impy-31ba05810c641f14e8ab5da8ad2aaf527779f6c1.zip
meta-impy-31ba05810c641f14e8ab5da8ad2aaf527779f6c1.tar.gz
meta-impy-31ba05810c641f14e8ab5da8ad2aaf527779f6c1.tar.bz2
meta-impy-31ba05810c641f14e8ab5da8ad2aaf527779f6c1.tar.xz
Second Life viewer sources 1.19.1.2
Diffstat (limited to 'linden/indra/llui/llpanel.cpp')
-rw-r--r--linden/indra/llui/llpanel.cpp12
1 files changed, 11 insertions, 1 deletions
diff --git a/linden/indra/llui/llpanel.cpp b/linden/indra/llui/llpanel.cpp
index 9a3f1a2..567d29e 100644
--- a/linden/indra/llui/llpanel.cpp
+++ b/linden/indra/llui/llpanel.cpp
@@ -715,7 +715,17 @@ LLString LLPanel::getString(const LLString& name, const LLString::format_map_t&
715 formatted_string.setArgList(args); 715 formatted_string.setArgList(args);
716 return formatted_string.getString(); 716 return formatted_string.getString();
717 } 717 }
718 llerrs << "Failed to find string " << name << " in panel " << getName() << llendl; 718 LLString err_str("Failed to find string " + name + " in panel " + getName());
719 // *TODO: once the QAR-369 ui-cleanup work on settings is in we need to change the following line to be
720 //if(LLUI::sConfigGroup->getBOOL("QAMode"))
721 if(LLUI::sQAMode)
722 {
723 llerrs << err_str << llendl;
724 }
725 else
726 {
727 llwarns << err_str << llendl;
728 }
719 return LLString::null; 729 return LLString::null;
720} 730}
721 731