summaryrefslogtreecommitdiff
path: root/indra/llxuixml
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-03-16 14:54:56 -0400
committerLoren Shih <seraph@lindenlab.com>2011-03-16 14:54:56 -0400
commit037a83cd47e016f70092bccfdb2c13e759c6ff0a (patch)
tree2183c8ef1364d5f4e784cb91ea4d67b1861b2452 /indra/llxuixml
parent15b0509c01dbeec6854f4a0a5965e900eda06de1 (diff)
parent742dd75751f65224d80eb4f7d20daf5a21776c5f (diff)
Automated merge up from viewer-development into mesh-development
Diffstat (limited to 'indra/llxuixml')
-rw-r--r--indra/llxuixml/lltrans.cpp5
-rw-r--r--indra/llxuixml/lltrans.h2
2 files changed, 7 insertions, 0 deletions
diff --git a/indra/llxuixml/lltrans.cpp b/indra/llxuixml/lltrans.cpp
index 11127a53f5..e13d73c640 100644
--- a/indra/llxuixml/lltrans.cpp
+++ b/indra/llxuixml/lltrans.cpp
@@ -255,3 +255,8 @@ std::string LLTrans::getCountString(const std::string& language, const std::stri
std::string key = llformat("%s%s", xml_desc.c_str(), form);
return getString(key, args);
}
+
+void LLTrans::setDefaultArg(const std::string& name, const std::string& value)
+{
+ sDefaultArgs[name] = value;
+}
diff --git a/indra/llxuixml/lltrans.h b/indra/llxuixml/lltrans.h
index 42c27b6976..5b127b53cf 100644
--- a/indra/llxuixml/lltrans.h
+++ b/indra/llxuixml/lltrans.h
@@ -110,6 +110,8 @@ public:
return sDefaultArgs;
}
+ static void setDefaultArg(const std::string& name, const std::string& value);
+
// insert default args into an arg list
static void getArgs(LLStringUtil::format_map_t& args)
{