viewer#1424 Favorites in Appearance floater #3

Menus

1 files changed, 27 insertions, 2 deletions

diff --git a/indra/newview/lloutfitslist.h b/indra/newview/lloutfitslist.h
index 1e053eccc7..94df963977 100644
--- a/indra/newview/lloutfitslist.h
+++ b/indra/newview/lloutfitslist.h
@@ -41,6 +41,7 @@
 class LLAccordionCtrlTab;
 class LLInventoryCategoriesObserver;
 class LLOutfitListGearMenuBase;
+class LLOutfitListSortMenuBase;
 class LLWearableItemsList;
 class LLListContextMenu;
 
@@ -92,6 +93,7 @@ public:
     boost::signals2::connection setSelectionChangeCallback(selection_change_callback_t cb);
     void outfitRightClickCallBack(LLUICtrl* ctrl, S32 x, S32 y, const LLUUID& cat_id);
 
+    void onAction(const LLSD& userdata);
     virtual bool isActionEnabled(const LLSD& userdata);
     virtual void performAction(std::string action);
     virtual bool hasItemSelected() = 0;
@@ -109,6 +111,10 @@ public:
 
     virtual bool getHasExpandableFolders() = 0;
 
+    virtual void updateMenuItemsVisibility();
+    virtual LLToggleableMenu* getGearMenu();
+    virtual bool getTrashMenuVisible() { return true; };
+
 protected:
     void observerCallback(const LLUUID& category_id);
     virtual LLOutfitListGearMenuBase* createGearMenu() = 0;
@@ -139,6 +145,7 @@ protected:
     selection_change_signal_t		mSelectionChangeSignal;
     LLListContextMenu*				mOutfitMenu;
     LLOutfitListGearMenuBase*		mGearMenu;
+    boost::signals2::connection     mGearMenuConnection;
 };
 
 //////////////////////////////////////////////////////////////////////////
@@ -155,7 +162,6 @@ protected:
     /* virtual */ LLContextMenu* createMenu();
 
     bool onEnable(LLSD::String param);
-
     bool onVisible(LLSD::String param);
 
     static void editOutfit();
@@ -204,6 +210,22 @@ private:
     bool onVisible(LLSD::String param);
 };
 
+class LLOutfitListSortMenu
+{
+public:
+    LLOutfitListSortMenu(LLOutfitListBase* parent_panel);
+
+    LLToggleableMenu* getMenu();
+    void updateItemsVisibility();
+
+private:
+    void onUpdateItemsVisibility();
+
+    LLToggleableMenu* mMenu;
+    LLHandle<LLPanel> mPanelHandle;
+};
+
+
 class LLOutfitListGearMenu : public LLOutfitListGearMenuBase
 {
 public:
@@ -301,6 +323,9 @@ public:
 
     /*virtual*/ bool getHasExpandableFolders() { return TRUE; }
 
+    virtual LLToggleableMenu* getSortMenu();
+    void updateMenuItemsVisibility();
+
 protected:
     LLOutfitListGearMenuBase* createGearMenu();
 
@@ -390,7 +415,7 @@ private:
 	// Used to monitor COF changes for updating items worn state. See EXT-8636.
 	uuid_vec_t						mCOFLinkedItems;
 
-	//LLOutfitListGearMenu*			mGearMenu;
+	LLOutfitListSortMenu*			mSortMenu;
 
 	//bool							mIsInitialized;
 	/**