diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-26 09:47:00 +0000 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-26 09:47:00 +0000 |
commit | 1942e607f8298870b10f4147388cb4f307a8c08e (patch) | |
tree | 4bff4261cf5536c210526e85e42fa3da10ffd5ae /indra/newview/llpaneloutfitsinventory.h | |
parent | 664b848bac30a7f3f1177a683e0913c9457dc041 (diff) | |
parent | 35e5a5005e7ab85a640aee08137a96c42e4d55ea (diff) |
merge.
Diffstat (limited to 'indra/newview/llpaneloutfitsinventory.h')
-rw-r--r-- | indra/newview/llpaneloutfitsinventory.h | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/indra/newview/llpaneloutfitsinventory.h b/indra/newview/llpaneloutfitsinventory.h index 4d903a389b..7769a7d172 100644 --- a/indra/newview/llpaneloutfitsinventory.h +++ b/indra/newview/llpaneloutfitsinventory.h @@ -61,8 +61,6 @@ public: void onSelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action); void onSelectorButtonClicked(); - LLInventoryPanel* getActivePanel() { return mInventoryPanel; } - // If a compatible listener type is selected, then return a pointer to that. // Otherwise, return NULL. LLFolderViewEventListener* getCorrectListenerForAction(); @@ -74,9 +72,26 @@ protected: private: LLSidepanelAppearance* mParent; - LLInventoryPanel* mInventoryPanel; LLSaveFolderState* mSavedFolderState; +public: + ////////////////////////////////////////////////////////////////////////////////// + // Accordion // + LLInventoryPanel* getActivePanel(); + bool isAccordionPanel(LLInventoryPanel *panel); + +protected: + void initAccordionPanels(); + void onAccordionSelectionChange(LLInventoryPanel* accordion_panel, const std::deque<LLFolderViewItem*> &items, BOOL user_action); + +private: + LLInventoryPanel* mActivePanel; + typedef std::vector<LLInventoryPanel *> accordionpanels_vec_t; + accordionpanels_vec_t mAccordionPanels; + + // Accordion // + //////////////////////////////////////////////////////////////////////////////// + ////////////////////////////////////////////////////////////////////////////////// // List Commands // @@ -95,7 +110,7 @@ private: LLPanel* mListCommands; LLMenuGL* mMenuGearDefault; LLMenuGL* mMenuAdd; - // // + // List Commands // //////////////////////////////////////////////////////////////////////////////// }; |