Merge branch 'develop' of github.com:secondlife/viewer into rye/infinitemac

1 files changed, 9 insertions, 0 deletions

diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp
index c618483fc4..1d1b31d2a6 100644
--- a/indra/newview/llsidepanelappearance.cpp
+++ b/indra/newview/llsidepanelappearance.cpp
@@ -40,6 +40,7 @@
 #include "llfloaterworldmap.h"
 #include "llfolderviewmodel.h"
 #include "llloadingindicator.h"
+#include "llmenubutton.h"
 #include "lloutfitobserver.h"
 #include "llpaneleditwearable.h"
 #include "llpaneloutfitsinventory.h"
@@ -145,6 +146,14 @@ bool LLSidepanelAppearance::postBuild()
 
     setWearablesLoading(gAgentWearables.isCOFChangeInProgress());
 
+
+    LLMenuButton* menu_gear_btn = getChild<LLMenuButton>("options_gear_btn");
+    LLMenuButton* menu_sort_btn = getChild<LLMenuButton>("sorting_menu_btn");
+    LLButton* menu_trash_btn = getChild<LLButton>("trash_btn");
+    LLPanel* menu_sort_btn_panel = getChild<LLPanel>("options_sort_btn_panel");
+    LLPanel* menu_trash_btn_panel = getChild<LLPanel>("trash_btn_panel");
+    mPanelOutfitsInventory->setMenuButtons(menu_gear_btn, menu_sort_btn, menu_trash_btn, menu_sort_btn_panel, menu_trash_btn_panel);
+
     return true;
 }