1 files changed, 6 insertions, 61 deletions

diff --git a/indra/newview/llpaneloutfitsinventory.cpp b/indra/newview/llpaneloutfitsinventory.cpp
index e2e2cf1a61..47c02793a3 100644
--- a/indra/newview/llpaneloutfitsinventory.cpp
+++ b/indra/newview/llpaneloutfitsinventory.cpp
@@ -33,7 +33,6 @@
 #include "llfloatersidepanelcontainer.h"
 #include "llinventoryfunctions.h"
 #include "llinventorymodelbackgroundfetch.h"
-#include "llmenubutton.h"
 #include "llnotificationsutil.h"
 #include "lloutfitgallery.h"
 #include "lloutfitobserver.h"
@@ -54,17 +53,12 @@ static const std::string SAVE_BTN("save_btn");
 
 static LLPanelInjector<LLPanelOutfitsInventory> t_inventory("panel_outfits_inventory");
 
-LLPanelOutfitsInventory::LLPanelOutfitsInventory()
-    : mMyOutfitsPanel(nullptr)
-    , mCurrentOutfitPanel(nullptr)
-    , mActivePanel(nullptr)
-    , mAppearanceTabs(nullptr)
-    , mInitialized(false)
-    , mGearMenu(nullptr)
-    , mSortMenu(nullptr)
-    , mTrashBtn(nullptr)
-    , mSortMenuPanel(nullptr)
-    , mTrashMenuPanel(nullptr)
+LLPanelOutfitsInventory::LLPanelOutfitsInventory() :
+    mMyOutfitsPanel(NULL),
+    mCurrentOutfitPanel(NULL),
+    mActivePanel(NULL),
+    mAppearanceTabs(NULL),
+    mInitialized(false)
 {
     gAgentWearables.addLoadedCallback(boost::bind(&LLPanelOutfitsInventory::onWearablesLoaded, this));
     gAgentWearables.addLoadingStartedCallback(boost::bind(&LLPanelOutfitsInventory::onWearablesLoading, this));
@@ -81,9 +75,6 @@ LLPanelOutfitsInventory::~LLPanelOutfitsInventory()
     {
         gSavedSettings.setS32("LastAppearanceTab", mAppearanceTabs->getCurrentPanelIndex());
     }
-    mGearMenuConnection.disconnect();
-    mSortMenuConnection.disconnect();
-    mTrashMenuConnection.disconnect();
 }
 
 // virtual
@@ -267,22 +258,6 @@ void LLPanelOutfitsInventory::initListCommandsHandlers()
     mOutfitGalleryPanel->childSetAction("trash_btn", boost::bind(&LLPanelOutfitsInventory::onTrashButtonClick, this));
 }
 
-void LLPanelOutfitsInventory::setMenuButtons(LLMenuButton* gear_menu, LLMenuButton* sort_menu, LLButton* trash_btn, LLPanel* sort_menu_panel, LLPanel* trash_menu_panel)
-{
-    mGearMenu = gear_menu;
-    mSortMenu = sort_menu;
-    mTrashBtn = trash_btn;
-    mSortMenuPanel = sort_menu_panel;
-    mTrashMenuPanel = trash_menu_panel;
-
-    mGearMenuConnection.disconnect();
-    mSortMenuConnection.disconnect();
-    mTrashMenuConnection.disconnect();
-    mGearMenuConnection = mGearMenu->setMouseDownCallback(boost::bind(&LLPanelOutfitsInventory::onGearMouseDown, this));
-    mSortMenuConnection = mSortMenu->setMouseDownCallback(boost::bind(&LLPanelOutfitsInventory::onGearMouseDown, this));
-    mTrashMenuConnection = mTrashBtn->setClickedCallback(boost::bind(&LLPanelOutfitsInventory::onTrashButtonClick, this));
-}
-
 void LLPanelOutfitsInventory::updateListCommands()
 {
     bool trash_enabled = isActionEnabled("delete");
@@ -309,14 +284,6 @@ void LLPanelOutfitsInventory::onTrashButtonClick()
     }
 }
 
-void LLPanelOutfitsInventory::onGearMouseDown()
-{
-    if (mActivePanel)
-    {
-        mActivePanel->updateMenuItemsVisibility();
-    }
-}
-
 bool LLPanelOutfitsInventory::isActionEnabled(const LLSD& userdata)
 {
     return mActivePanel && mActivePanel->isActionEnabled(userdata);
@@ -353,28 +320,6 @@ void LLPanelOutfitsInventory::onTabChange()
     mActivePanel->checkFilterSubString();
     mActivePanel->onOpen(LLSD());
 
-    if (mGearMenu)
-    {
-        mGearMenu->setMenu(mActivePanel->getGearMenu(), LLMenuButton::MP_BOTTOM_LEFT);
-    }
-    if (mSortMenu && mSortMenuPanel)
-    {
-        LLToggleableMenu* menu = mActivePanel->getSortMenu();
-        if (menu)
-        {
-            mSortMenu->setMenu(menu, LLMenuButton::MP_BOTTOM_LEFT);
-            mSortMenuPanel->setVisible(true);
-        }
-        else
-        {
-            mSortMenuPanel->setVisible(false);
-        }
-    }
-    if (mTrashMenuPanel)
-    {
-        mTrashMenuPanel->setVisible(mActivePanel->getTrashMenuVisible());
-    }
-
     updateVerbs();
 }