diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-03-02 13:00:18 +0000 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-03-02 13:00:18 +0000 |
commit | 9f8c6ace4a72c6a44d062df15d78c123772a72c0 (patch) | |
tree | 500492208cabd8d896c19a88cf5bf7eddf66eeab /indra/newview/llpanelmaininventory.h | |
parent | 28b95e4975f2333c0eb590b29740c3ce491a934d (diff) | |
parent | f8c76535a35aaf245e261357a59e977bac5b2501 (diff) |
merge
Diffstat (limited to 'indra/newview/llpanelmaininventory.h')
-rw-r--r-- | indra/newview/llpanelmaininventory.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index 2904d5de76..732a3b04e3 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -132,7 +132,7 @@ private: LLFilterEditor* mFilterEditor; LLTabContainer* mFilterTabs; - LLUICtrl* mCounterCtrl; + LLUICtrl* mCounterCtrl; LLHandle<LLFloater> mFinderHandle; LLInventoryPanel* mActivePanel; LLInventoryPanel* mWornItemsPanel; @@ -141,7 +141,9 @@ private: std::string mFilterText; std::string mFilterSubString; S32 mItemCount; - std::string mItemCountString; + std::string mItemCountString; + S32 mCategoryCount; + std::string mCategoryCountString; LLComboBox* mSearchTypeCombo; |