diff options
| author | Richard Linden <none@none> | 2010-07-09 14:30:49 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-07-09 14:30:49 -0700 |
| commit | 5b1386e5b6e147f2b253ca4e5f0ba3ee831f08a9 (patch) | |
| tree | 061dd6e1ae8c1cb12f2f0d7071acabd6487365a2 /indra/llui/lluistring.cpp | |
| parent | 05e6faf38172ab701ef2483408bffa9cceb4142e (diff) | |
| parent | ded3253d1f3d81421c2159805bc3df4f81e13d53 (diff) | |
merge
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 |