aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lltrans.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2009-04-30 13:04:20 -0500
committerJacek Antonelli2009-04-30 13:07:16 -0500
commitca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e (patch)
tree8348301d0ac44a524f1819b777686bf086907d76 /linden/indra/newview/lltrans.cpp
parentSecond Life viewer sources 1.22.11 (diff)
downloadmeta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.zip
meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.gz
meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.bz2
meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.xz
Second Life viewer sources 1.23.0-RC
Diffstat (limited to 'linden/indra/newview/lltrans.cpp')
-rw-r--r--linden/indra/newview/lltrans.cpp18
1 files changed, 8 insertions, 10 deletions
diff --git a/linden/indra/newview/lltrans.cpp b/linden/indra/newview/lltrans.cpp
index f4daf55..b6a2382 100644
--- a/linden/indra/newview/lltrans.cpp
+++ b/linden/indra/newview/lltrans.cpp
@@ -17,7 +17,8 @@
17 * There are special exceptions to the terms and conditions of the GPL as 17 * There are special exceptions to the terms and conditions of the GPL as
18 * it is applied to this Source Code. View the full text of the exception 18 * it is applied to this Source Code. View the full text of the exception
19 * in the file doc/FLOSS-exception.txt in this software distribution, or 19 * in the file doc/FLOSS-exception.txt in this software distribution, or
20 * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception 20 * online at
21 * http://secondlifegrid.net/programs/open_source/licensing/flossexception
21 * 22 *
22 * By copying, modifying or distributing this software, you acknowledge 23 * By copying, modifying or distributing this software, you acknowledge
23 * that you have read and understood your obligations described above, 24 * that you have read and understood your obligations described above,
@@ -89,15 +90,12 @@ std::string LLTrans::getString(const std::string &xml_desc, const LLStringUtil::
89 } 90 }
90 else 91 else
91 { 92 {
92 LLStringUtil::format_map_t args; 93 LLSD args;
93 args["[STRING_NAME]"] = xml_desc; 94 args["STRING_NAME"] = xml_desc;
94 llwarns << "Missing String: [" << xml_desc << "]" << llendl; 95 LL_WARNS_ONCE("configuration") << "Missing String in strings.xml: [" << xml_desc << "]" << LL_ENDL;
95 LLAlertDialog* dialogp = LLAlertDialog::showXml("MissingString", args); 96 LLNotifications::instance().add("MissingString", args);
96 if (dialogp == NULL) 97
97 { 98 return xml_desc;
98 llerrs << "Bad or missing alerts.xml!" << llendl;
99 }
100 return "";
101 } 99 }
102} 100}
103 101