diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-07-12 12:52:31 +0300 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-07-12 12:52:31 +0300 |
| commit | ea35754f08a9a76208d1edd80ed6bc55278eb575 (patch) | |
| tree | 1ceada3b919f4bf8dfa8e1dc048baadf87784795 /indra/llui/lluistring.cpp | |
| parent | d8e26b7b73b734e1745795788c844f6aab3360fe (diff) | |
| parent | ee50934d886b07c85e3be0515ff3e53625052faa (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui/lluistring.cpp')
| -rw-r--r-- | indra/llui/lluistring.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/indra/llui/lluistring.cpp b/indra/llui/lluistring.cpp index f7a53e87de..ac9e71665f 100644 --- a/indra/llui/lluistring.cpp +++ b/indra/llui/lluistring.cpp @@ -135,9 +135,16 @@ void LLUIString::updateResult() const mResult = mOrig; // get the defailt args + local args - LLStringUtil::format_map_t combined_args = LLTrans::getDefaultArgs(); - combined_args.insert(mArgs.begin(), mArgs.end()); - LLStringUtil::format(mResult, combined_args); + if (mArgs.empty()) + { + LLStringUtil::format(mResult, LLTrans::getDefaultArgs()); + } + else + { + LLStringUtil::format_map_t combined_args = LLTrans::getDefaultArgs(); + combined_args.insert(mArgs.begin(), mArgs.end()); + LLStringUtil::format(mResult, combined_args); + } } void LLUIString::updateWResult() const |