diff options
| author | Richard Linden <none@none> | 2010-07-09 14:26:56 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-07-09 14:26:56 -0700 |
| commit | 1f79bee86ee65a2eb3800db6be1853dd79d7a49d (patch) | |
| tree | da6b0df3f35ede4037a3e0bf36cf4c6d07dd4a28 /indra/llui/lluistring.cpp | |
| parent | 419bfb16fdd9b79d32736fd80652685a07f9e39f (diff) | |
EXT-8237 FIX Opening up Edit Outfit- Add More->Shirt causes FPS to drop from 60fps to 18fps for a really long time
EXT-8235 FIX HUGE long delay when reopening and/or closing edit outfit sidepanel if "Add More..." is active
EXT-7695 FIX UI lockup after add wearable, right click av -> Change Outfit
reviewed by Vir
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 |