diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-10-11 09:13:55 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-10-11 09:13:55 -0400 |
| commit | d62ad1ef8afc1b9abadbc611d373a7a7d9afc368 (patch) | |
| tree | 9f14b141e692c3b78eee846f12fc021feacf1de6 /indra/newview/llpanelmaininventory.h | |
| parent | c0ac11e24022eb51918e825414f2c04f3085bc61 (diff) | |
| parent | b6d22de58850fc9a5b34eeb5b7930e5845bfc42d (diff) | |
merge changes for 5.0.8-release
Diffstat (limited to 'indra/newview/llpanelmaininventory.h')
| -rw-r--r-- | indra/newview/llpanelmaininventory.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index 38936804ac..530f4e618c 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -34,6 +34,7 @@ #include "llfolderview.h" +class LLComboBox; class LLFolderViewItem; class LLInventoryPanel; class LLSaveFolderState; @@ -76,6 +77,8 @@ public: LLInventoryPanel* getPanel() { return mActivePanel; } LLInventoryPanel* getActivePanel() { return mActivePanel; } + LLInventoryPanel* getAllItemsPanel(); + void selectAllItemsPanel(); const LLInventoryPanel* getActivePanel() const { return mActivePanel; } const std::string& getFilterText() const { return mFilterText; } @@ -120,6 +123,8 @@ protected: void updateItemcountText(); void onFocusReceived(); + void onSelectSearchType(); + void updateSearchTypeCombo(); private: LLFloaterInventoryFinder* getFinder(); @@ -129,12 +134,14 @@ private: LLUICtrl* mCounterCtrl; LLHandle<LLFloater> mFinderHandle; LLInventoryPanel* mActivePanel; + LLInventoryPanel* mWornItemsPanel; bool mResortActivePanel; LLSaveFolderState* mSavedFolderState; std::string mFilterText; std::string mFilterSubString; S32 mItemCount; std::string mItemCountString; + LLComboBox* mSearchTypeCombo; ////////////////////////////////////////////////////////////////////////////////// |