diff options
| author | Andrew A. de Laix <alain@lindenlab.com> | 2010-06-09 15:47:37 -0700 |
|---|---|---|
| committer | Andrew A. de Laix <alain@lindenlab.com> | 2010-06-09 15:47:37 -0700 |
| commit | f2f7f7b3bb2c8466e2a07f8f586a1a63fdae8a66 (patch) | |
| tree | 9c74f8e5ca2601bbdf87a4b5e034b76784bdacea /indra/newview/llpaneloutfitsinventory.h | |
| parent | 163b767944caa4b2a474abf93e64eaeac1f02587 (diff) | |
| parent | 4bbca7c086724da1af4f8cb6b22e6de8320a0b1b (diff) | |
merge
Diffstat (limited to 'indra/newview/llpaneloutfitsinventory.h')
| -rw-r--r-- | indra/newview/llpaneloutfitsinventory.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llpaneloutfitsinventory.h b/indra/newview/llpaneloutfitsinventory.h index 7bdd37c16c..aff7839bcc 100644 --- a/indra/newview/llpaneloutfitsinventory.h +++ b/indra/newview/llpaneloutfitsinventory.h @@ -47,6 +47,7 @@ class LLMenuGL; class LLSidepanelAppearance; class LLTabContainer; class LLSaveOutfitComboBtn; +class LLOutfitListGearMenu; class LLPanelOutfitsInventory : public LLPanel { @@ -116,9 +117,8 @@ private: protected: void initListCommandsHandlers(); void updateListCommands(); - void onGearButtonClick(); void onWearButtonClick(); - void showActionMenu(LLMenuGL* menu, std::string spawning_view_name); + void showGearMenu(); void onTrashButtonClick(); void onClipboardAction(const LLSD& userdata); BOOL isActionEnabled(const LLSD& command_name); @@ -129,7 +129,7 @@ protected: void onWearablesLoaded(); private: LLPanel* mListCommands; - LLMenuGL* mMenuGearDefault; + LLOutfitListGearMenu* mGearMenu; LLMenuGL* mMenuAdd; // List Commands // //////////////////////////////////////////////////////////////////////////////// |