diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-08-26 15:14:12 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-08-26 15:14:12 -0400 |
| commit | 7ca10e516126e5fa9b076c04957b491495513907 (patch) | |
| tree | 690323c7379c8151b1d7e251fa2878c10603fd61 /indra/newview/llpanelmaininventory.cpp | |
| parent | 1e2a6ee3f440b7d076dc97f3a0628c90195f5386 (diff) | |
| parent | 6e1138585bf745f73f0bb99ca62f77eeb273f1e4 (diff) | |
merge changes for 3.6.4-release
Diffstat (limited to 'indra/newview/llpanelmaininventory.cpp')
| -rwxr-xr-x | indra/newview/llpanelmaininventory.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index d6535c88e9..53deded2f2 100755 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -130,6 +130,8 @@ BOOL LLPanelMainInventory::postBuild() mFilterTabs = getChild<LLTabContainer>("inventory filter tabs"); mFilterTabs->setCommitCallback(boost::bind(&LLPanelMainInventory::onFilterSelected, this)); + mCounterCtrl = getChild<LLUICtrl>("ItemcountText"); + //panel->getFilter().markDefault(); // Set up the default inv. panel/filter settings. @@ -566,7 +568,7 @@ void LLPanelMainInventory::draw() void LLPanelMainInventory::updateItemcountText() { // *TODO: Calling setlocale() on each frame may be inefficient. - LLLocale locale(LLStringUtil::getLocale()); + //LLLocale locale(LLStringUtil::getLocale()); std::string item_count_string; LLResMgr::getInstance()->getIntegerString(item_count_string, gInventory.getItemCount()); @@ -589,8 +591,7 @@ void LLPanelMainInventory::updateItemcountText() text = getString("ItemcountUnknown"); } - // *TODO: Cache the LLUICtrl* for the ItemcountText control - getChild<LLUICtrl>("ItemcountText")->setValue(text); + mCounterCtrl->setValue(text); } void LLPanelMainInventory::onFocusReceived() |