diff options
author | Paul Guslisty <pguslisty@productengine.com> | 2010-05-12 17:38:07 +0300 |
---|---|---|
committer | Paul Guslisty <pguslisty@productengine.com> | 2010-05-12 17:38:07 +0300 |
commit | bc9b15a348640ee207274a14ceb87c12150adcb2 (patch) | |
tree | 3f90d6202bbd3548f117c4c7e827c58412fb6578 /indra/newview/llpaneloutfitedit.h | |
parent | 79332f4e3e1131fbab88b7b75cca7ab57c3c3e25 (diff) |
EXT-7203 FIXED Re-enabled inventory search for wearables panel
- Insert filter editor and inventory panels into layout_stack
- restored filter functionality for a list view
- added proper switching between flat list view and folder list view
- made a little optimization: got rid of redundant findChild calls because of childSetVisible(..., childGetValue(...));
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/362/
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llpaneloutfitedit.h')
-rw-r--r-- | indra/newview/llpaneloutfitedit.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/indra/newview/llpaneloutfitedit.h b/indra/newview/llpaneloutfitedit.h index 04c94e553f..cb8283fca3 100644 --- a/indra/newview/llpaneloutfitedit.h +++ b/indra/newview/llpaneloutfitedit.h @@ -42,6 +42,7 @@ #include "llremoteparcelrequest.h" #include "llinventory.h" +#include "llinventoryitemslist.h" #include "llinventorymodel.h" class LLButton; @@ -87,6 +88,7 @@ public: void toggleAddWearablesPanel(); void showWearablesFilter(); void showFilteredWearablesPanel(); + void showFilteredFolderWearablesPanel(); void saveOutfit(bool as_new = false); void showSaveMenu(); @@ -103,6 +105,14 @@ public: void update(); void updateVerbs(); + /** + * @brief Helper function. Shows one panel instead of another. + * If panels already switched does nothing and returns false. + * @param switch_from_panel panel to hide + * @param switch_to_panel panel to show + * @retun returns true if switching happened, false if not. + */ + bool switchPanels(LLPanel* switch_from_panel, LLPanel* switch_to_panel); private: @@ -115,9 +125,13 @@ private: LLSaveFolderState* mSavedFolderState; std::string mSearchString; LLButton* mEditWearableBtn; + LLButton* mFolderViewBtn; + LLButton* mListViewBtn; LLToggleableMenu* mSaveMenu; - LLFilteredWearableListManager* mWearableListManager; + LLFilteredWearableListManager* mWearableListManager; + LLInventoryItemsList* mWearableItemsList; + LLPanel* mWearableItemsPanel; LLCOFObserver* mCOFObserver; std::vector<LLLookItemType> mLookItemTypes; |