diff options
| author | Aura Linden <aura@lindenlab.com> | 2014-03-13 21:55:22 +0000 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2014-03-13 21:55:22 +0000 |
| commit | 706ec08deb3feaea9c5c3516dea657b86b0474c3 (patch) | |
| tree | a918eac8a10e43b78d156cb0620520420f0dfc62 /indra/newview/llpanelmaininventory.cpp | |
| parent | d2bb4dae980a887a30b206875d8f9419901ed66a (diff) | |
| parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) | |
Merged in viewer-release
Diffstat (limited to 'indra/newview/llpanelmaininventory.cpp')
| -rwxr-xr-x | indra/newview/llpanelmaininventory.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index 1ff0bfd091..68c22c12fd 100755 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -58,7 +58,7 @@ const std::string FILTERS_FILENAME("filters.xml"); -static LLRegisterPanelClassWrapper<LLPanelMainInventory> t_inventory("panel_main_inventory"); +static LLPanelInjector<LLPanelMainInventory> t_inventory("panel_main_inventory"); void on_file_loaded_for_save(BOOL success, LLViewerFetchedTexture *src_vi, @@ -574,13 +574,16 @@ void LLPanelMainInventory::draw() void LLPanelMainInventory::updateItemcountText() { - // *TODO: Calling setlocale() on each frame may be inefficient. - //LLLocale locale(LLStringUtil::getLocale()); - std::string item_count_string; - LLResMgr::getInstance()->getIntegerString(item_count_string, gInventory.getItemCount()); + if(mItemCount != gInventory.getItemCount()) + { + mItemCount = gInventory.getItemCount(); + mItemCountString = ""; + LLLocale locale(LLLocale::USER_LOCALE); + LLResMgr::getInstance()->getIntegerString(mItemCountString, mItemCount); + } LLStringUtil::format_map_t string_args; - string_args["[ITEM_COUNT]"] = item_count_string; + string_args["[ITEM_COUNT]"] = mItemCountString; string_args["[FILTER]"] = getFilterText(); std::string text = ""; |