diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-01-17 22:41:25 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-01-17 22:41:25 -0800 |
| commit | 9025656bba1520b6b442ce0a359fad0217e6d970 (patch) | |
| tree | 799db806b36b279665f9ce419ce653868d2bf28b /indra/llui | |
| parent | 1f9529c0c2b02c4ceee912f8ecb35181174cc7cc (diff) | |
EXP-1773 : A bit of code cleanup and defensive coding in an attempt to alleviate some errand crashes.
Diffstat (limited to 'indra/llui')
| -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 |