diff options
| author | Richard Linden <none@none> | 2010-07-27 14:22:14 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-07-27 14:22:14 -0700 |
| commit | 15247f086989a43881d79c1ee5416bb00721eb68 (patch) | |
| tree | e77d629f6d03ed7ca471e77ccefcd9437be82c49 /indra/llui/lluistring.cpp | |
| parent | 5d85dad85f07ea23b3a2892276d8ac591a966864 (diff) | |
Backed out changeset: 58571b4e704b
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 |