1 files changed, 4 insertions, 24 deletions

diff --git a/indra/newview/llpanelwearing.cpp b/indra/newview/llpanelwearing.cpp
index 3aedde74c6..c1534c9abd 100644
--- a/indra/newview/llpanelwearing.cpp
+++ b/indra/newview/llpanelwearing.cpp
@@ -113,7 +113,6 @@ protected:
                       boost::bind(&LLAppearanceMgr::removeItemsFromAvatar, LLAppearanceMgr::getInstance(), mUUIDs, no_op));
         registrar.add("Wearing.Detach",
                       boost::bind(&LLAppearanceMgr::removeItemsFromAvatar, LLAppearanceMgr::getInstance(), mUUIDs, no_op));
-        registrar.add("Wearing.Favorite", boost::bind(toggle_favorites, mUUIDs));
         LLContextMenu* menu = createFromFile("menu_wearing_tab.xml");
 
         updateMenuItemsVisibility(menu);
@@ -126,8 +125,6 @@ protected:
         bool bp_selected            = false;    // true if body parts selected
         bool clothes_selected       = false;
         bool attachments_selected   = false;
-        bool can_favorite = false;
-        bool can_unfavorite = false;
 
         // See what types of wearables are selected.
         for (uuid_vec_t::const_iterator it = mUUIDs.begin(); it != mUUIDs.end(); ++it)
@@ -140,9 +137,6 @@ protected:
                 continue;
             }
 
-            LLUUID linked_id = item->getLinkedUUID();
-            LLViewerInventoryItem* linked_item = gInventory.getItem(linked_id);
-
             LLAssetType::EType type = item->getType();
             if (type == LLAssetType::AT_CLOTHING)
             {
@@ -156,8 +150,6 @@ protected:
             {
                 attachments_selected = true;
             }
-            can_favorite |= !linked_item->getIsFavorite();
-            can_unfavorite |= linked_item->getIsFavorite();
         }
 
         // Enable/disable some menu items depending on the selection.
@@ -174,8 +166,6 @@ protected:
         menu->setItemVisible("detach",      allow_detach);
         menu->setItemVisible("edit_outfit_separator", show_touch | show_edit | allow_take_off || allow_detach);
         menu->setItemVisible("show_original", mUUIDs.size() == 1);
-        menu->setItemVisible("favorites_add", can_favorite);
-        menu->setItemVisible("favorites_remove", can_unfavorite);
     }
 };
 
@@ -242,10 +232,6 @@ LLPanelWearing::~LLPanelWearing()
     {
         mAttachmentsChangedConnection.disconnect();
     }
-    if (mGearMenuConnection.connected())
-    {
-        mGearMenuConnection.disconnect();
-    }
 }
 
 bool LLPanelWearing::postBuild()
@@ -263,6 +249,10 @@ bool LLPanelWearing::postBuild()
     mTempItemsList->setFgUnselectedColor(LLColor4::white);
     mTempItemsList->setRightMouseDownCallback(boost::bind(&LLPanelWearing::onTempAttachmentsListRightClick, this, _1, _2, _3));
 
+    LLMenuButton* menu_gear_btn = getChild<LLMenuButton>("options_gear_btn");
+
+    menu_gear_btn->setMenu(mGearMenu->getMenu());
+
     return true;
 }
 
@@ -570,16 +560,6 @@ void LLPanelWearing::onRemoveAttachment()
     }
 }
 
-LLToggleableMenu* LLPanelWearing::getGearMenu()
-{
-    return mGearMenu->getMenu();
-}
-
-LLToggleableMenu* LLPanelWearing::getSortMenu()
-{
-    return NULL;
-}
-
 void LLPanelWearing::onRemoveItem()
 {
     if (mWearablesTab->isExpanded())