diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-10-20 20:50:20 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-10-20 20:50:20 -0700 |
| commit | f38d21fe60945d71f8740f6aba58b40d4a722d58 (patch) | |
| tree | 5622ef17bb53f05027881914622463ac1426eb14 /indra/newview/llpaneloutfitedit.h | |
| parent | 9652de51ce5a64136b66c04461b12005568bd5f1 (diff) | |
| parent | c12c60df4a28b3cb91870ae0666eb6b3422ff96b (diff) | |
STORM-263 : merge to viewer-development
Diffstat (limited to 'indra/newview/llpaneloutfitedit.h')
| -rw-r--r-- | indra/newview/llpaneloutfitedit.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llpaneloutfitedit.h b/indra/newview/llpaneloutfitedit.h index 2dca986e33..963db84503 100644 --- a/indra/newview/llpaneloutfitedit.h +++ b/indra/newview/llpaneloutfitedit.h @@ -54,6 +54,7 @@ class LLScrollListCtrl; class LLToggleableMenu; class LLFilterEditor; class LLFilteredWearableListManager; +class LLMenuButton; class LLMenuGL; class LLFindNonLinksByMask; class LLFindWearablesOfType; @@ -186,8 +187,6 @@ public: std::string& tooltip_msg); private: - - void onGearButtonClick(LLUICtrl* clicked_button); void onAddMoreButtonClicked(); void showFilteredWearablesListView(LLWearableType::EType type); void onOutfitChanging(bool started); @@ -238,8 +237,8 @@ private: LLMenuGL* mAddWearablesGearMenu; bool mInitialized; std::auto_ptr<LLSaveOutfitComboBtn> mSaveComboBtn; - - + LLMenuButton* mWearablesGearMenuBtn; + LLMenuButton* mGearMenuBtn; }; |