diff options
| author | Christian Goetze (CG) <cg@lindenlab.com> | 2010-07-22 13:29:05 -0700 |
|---|---|---|
| committer | Christian Goetze (CG) <cg@lindenlab.com> | 2010-07-22 13:29:05 -0700 |
| commit | fe8a5a007ab82f3d6a763c5cb133e1299d238632 (patch) | |
| tree | 7a0787f0cb5a70890b878e999521ff4522fd75b4 /indra/llui/lluistring.cpp | |
| parent | 4339600d43601f07d01c676cce5da17c2758c4cb (diff) | |
| parent | 9838884d908ad0c910251c64c7cb3c761ac11f70 (diff) | |
merged from "viewer-hotfix"
Diffstat (limited to 'indra/llui/lluistring.cpp')
| -rw-r--r-- | indra/llui/lluistring.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/indra/llui/lluistring.cpp b/indra/llui/lluistring.cpp index ac9e71665f..f7a53e87de 100644 --- a/indra/llui/lluistring.cpp +++ b/indra/llui/lluistring.cpp @@ -135,16 +135,9 @@ void LLUIString::updateResult() const mResult = mOrig; // get the defailt args + local 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); - } + LLStringUtil::format_map_t combined_args = LLTrans::getDefaultArgs(); + combined_args.insert(mArgs.begin(), mArgs.end()); + LLStringUtil::format(mResult, combined_args); } void LLUIString::updateWResult() const |