viewer#1424 Favorites in Appearance floater #3

Menus

1 files changed, 14 insertions, 4 deletions

diff --git a/indra/newview/llpanelwearing.cpp b/indra/newview/llpanelwearing.cpp
index bfdb0fbc88..b66c546f9b 100644
--- a/indra/newview/llpanelwearing.cpp
+++ b/indra/newview/llpanelwearing.cpp
@@ -232,6 +232,10 @@ LLPanelWearing::~LLPanelWearing()
 	{
 		mAttachmentsChangedConnection.disconnect();
 	}
+    if (mGearMenuConnection.connected())
+    {
+        mGearMenuConnection.disconnect();
+    }
 }
 
 BOOL LLPanelWearing::postBuild()
@@ -249,10 +253,6 @@ 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;
 }
 
@@ -560,6 +560,16 @@ void LLPanelWearing::onRemoveAttachment()
 	}
 }
 
+LLToggleableMenu* LLPanelWearing::getGearMenu()
+{
+    return mGearMenu->getMenu();
+}
+
+LLToggleableMenu* LLPanelWearing::getSortMenu()
+{
+    return NULL;
+}
+
 void LLPanelWearing::onRemoveItem()
 {
 	if (mWearablesTab->isExpanded())