diff options
| author | Richard Linden <none@none> | 2012-01-19 19:44:15 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-01-19 19:44:15 -0800 |
| commit | 4fa9f2892b7a9967f9e97228c17e7b277fc56aae (patch) | |
| tree | c7e330b71e4d5127902f9b4fc5fbeabadf021a15 /indra/llui/lluistring.cpp | |
| parent | 9de0b5ed4891dcfcb54e35d9bb0401309455d66a (diff) | |
| parent | 19320842ebc39c1b528a2107323f9e918d688177 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge
Diffstat (limited to 'indra/llui/lluistring.cpp')
| -rw-r--r-- | indra/llui/lluistring.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/indra/llui/lluistring.cpp b/indra/llui/lluistring.cpp index ac69d3bf85..c4e073ccdb 100644 --- a/indra/llui/lluistring.cpp +++ b/indra/llui/lluistring.cpp @@ -128,17 +128,13 @@ void LLUIString::updateResult() const } mResult = mOrig; - // get the defailt args + local args - if (!mArgs || mArgs->empty()) + // get the default args + local args + LLStringUtil::format_map_t combined_args = LLTrans::getDefaultArgs(); + if (mArgs && !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); } + LLStringUtil::format(mResult, combined_args); } void LLUIString::updateWResult() const |