1 files changed, 4 insertions, 62 deletions

diff --git a/indra/newview/lloutfitslist.h b/indra/newview/lloutfitslist.h
index bafc0fbb81..fad0e638fb 100644
--- a/indra/newview/lloutfitslist.h
+++ b/indra/newview/lloutfitslist.h
@@ -41,7 +41,6 @@
 class LLAccordionCtrlTab;
 class LLInventoryCategoriesObserver;
 class LLOutfitListGearMenuBase;
-class LLOutfitListSortMenuBase;
 class LLWearableItemsList;
 class LLListContextMenu;
 
@@ -62,17 +61,6 @@ public:
     /*virtual*/ bool compare(const LLAccordionCtrlTab* tab1, const LLAccordionCtrlTab* tab2) const;
 };
 
-class LLOutfitTabFavComparator : public LLAccordionCtrl::LLTabComparator
-{
-    LOG_CLASS(LLOutfitTabFavComparator);
-
-public:
-    LLOutfitTabFavComparator() {};
-    virtual ~LLOutfitTabFavComparator() {};
-
-    /*virtual*/ bool compare(const LLAccordionCtrlTab* tab1, const LLAccordionCtrlTab* tab2) const;
-};
-
 class LLOutfitListBase : public LLPanelAppearanceTab
 {
 public:
@@ -104,7 +92,6 @@ 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;
@@ -122,12 +109,6 @@ public:
 
     virtual bool getHasExpandableFolders() = 0;
 
-    virtual void onChangeSortOrder(const LLSD& userdata) = 0;
-
-    virtual void updateMenuItemsVisibility();
-    virtual LLToggleableMenu* getGearMenu();
-    virtual bool getTrashMenuVisible() { return true; };
-
 protected:
     void observerCallback(const LLUUID& category_id);
     virtual LLOutfitListGearMenuBase* createGearMenu() = 0;
@@ -137,6 +118,8 @@ protected:
     void onOutfitsRemovalConfirmation(const LLSD& notification, const LLSD& response);
     virtual void onChangeOutfitSelection(LLWearableItemsList* list, const LLUUID& category_id) = 0;
 
+    bool isOutfitFolder(LLViewerInventoryCategory* cat) const;
+
     static void onIdle(void* userdata);
     void onIdleRefreshList();
 
@@ -158,7 +141,6 @@ protected:
     selection_change_signal_t       mSelectionChangeSignal;
     LLListContextMenu*              mOutfitMenu;
     LLOutfitListGearMenuBase*       mGearMenu;
-    boost::signals2::connection     mGearMenuConnection;
 };
 
 //////////////////////////////////////////////////////////////////////////
@@ -175,6 +157,7 @@ protected:
     /* virtual */ LLContextMenu* createMenu();
 
     bool onEnable(LLSD::String param);
+
     bool onVisible(LLSD::String param);
 
     static void editOutfit();
@@ -182,7 +165,6 @@ protected:
     static void renameOutfit(const LLUUID& outfit_cat_id);
 
     void onThumbnail(const LLUUID &outfit_cat_id);
-    void onFavorite(const LLUUID& outfit_cat_id);
     void onSave(const LLUUID &outfit_cat_id);
 
 private:
@@ -202,7 +184,6 @@ public:
 protected:
     virtual void onUpdateItemsVisibility();
     virtual void onThumbnail();
-    virtual void onFavorite();
     virtual void onChangeSortOrder();
 
     const LLUUID& getSelectedOutfitID();
@@ -223,23 +204,6 @@ private:
     bool onVisible(LLSD::String param);
 };
 
-class LLOutfitListSortMenu
-{
-public:
-    LLOutfitListSortMenu(LLOutfitListBase* parent_panel);
-
-    LLToggleableMenu* getMenu();
-    void updateItemsVisibility();
-
-private:
-    void onUpdateItemsVisibility();
-    bool onEnable(LLSD::String param);
-
-    LLToggleableMenu* mMenu;
-    LLHandle<LLPanel> mPanelHandle;
-};
-
-
 class LLOutfitListGearMenu : public LLOutfitListGearMenuBase
 {
 public:
@@ -259,16 +223,8 @@ public:
         Params() : cat_id("cat_id") {}
     };
 
-    virtual void draw();
     virtual bool handleToolTip(S32 x, S32 y, MASK mask);
 
-    void setFavorite(bool is_favorite);
-    bool getFavorite() const { return mIsFavorite; }
-    void setOutfitSelected(bool val);
-
-    static LLUIImage* sFavoriteIcon;
-    static LLUIColor sFgColor;
-
  protected:
     LLOutfitAccordionCtrlTab(const LLOutfitAccordionCtrlTab::Params &p)
         : LLAccordionCtrlTab(p),
@@ -276,12 +232,7 @@ public:
     {}
     friend class LLUICtrlFactory;
 
-    void updateTitleColor();
-    void drawFavoriteIcon();
-
     LLUUID mFolderID;
-    bool mIsFavorite = false;
-    bool mIsSelected = false;
 };
   /**
  * @class LLOutfitsList
@@ -300,7 +251,6 @@ public:
     virtual ~LLOutfitsList();
 
     /*virtual*/ bool postBuild();
-    void initComparator();
 
     /*virtual*/ void onOpen(const LLSD& info);
 
@@ -339,10 +289,6 @@ public:
 
     /*virtual*/ bool getHasExpandableFolders() { return true; }
 
-    /*virtual*/ void onChangeSortOrder(const LLSD& userdata);
-    virtual LLToggleableMenu* getSortMenu();
-    void updateMenuItemsVisibility();
-
 protected:
     LLOutfitListGearMenuBase* createGearMenu();
 
@@ -413,8 +359,6 @@ private:
 
     static void onOutfitRename(const LLSD& notification, const LLSD& response);
 
-    void handleInvFavColorChange();
-
     //LLInventoryCategoriesObserver*    mCategoriesObserver;
 
     LLAccordionCtrl*                mAccordion;
@@ -432,15 +376,13 @@ private:
     // Used to monitor COF changes for updating items worn state. See EXT-8636.
     uuid_vec_t                      mCOFLinkedItems;
 
-    LLOutfitListSortMenu*         mSortMenu;
+    //LLOutfitListGearMenu*         mGearMenu;
 
     //bool                          mIsInitialized;
     /**
      * True if there is a selection inside currently selected outfit
      */
     bool                            mItemSelected;
-
-    boost::signals2::connection                   mSavedSettingInvFavColor;
 };
 
 #endif //LL_LLOUTFITSLIST_H