diff options
author | Wolfpup Lowenhar <wolfpup67@earthlink.net> | 2010-10-25 22:24:44 -0400 |
---|---|---|
committer | Wolfpup Lowenhar <wolfpup67@earthlink.net> | 2010-10-25 22:24:44 -0400 |
commit | 2e023b0affb733c025e4c15d6551236c8eb28950 (patch) | |
tree | 5721e9651934a6cb01554a3087f252f3005a4101 /indra/newview/llpaneloutfitedit.h | |
parent | 6da1e54e6a8b66a2cad7c8c89de279ca5b9ac7dd (diff) | |
parent | a40a2a7a465f6e03ca495c301dfbf7bfa376be30 (diff) |
Merge from Viewer-development
Diffstat (limited to 'indra/newview/llpaneloutfitedit.h')
-rw-r--r-- | indra/newview/llpaneloutfitedit.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpaneloutfitedit.h b/indra/newview/llpaneloutfitedit.h index 963db84503..fd366e9cbc 100644 --- a/indra/newview/llpaneloutfitedit.h +++ b/indra/newview/llpaneloutfitedit.h @@ -233,8 +233,8 @@ private: std::vector<LLFilterItem*> mListViewItemTypes; LLCOFWearables* mCOFWearables; - LLMenuGL* mGearMenu; - LLMenuGL* mAddWearablesGearMenu; + LLToggleableMenu* mGearMenu; + LLToggleableMenu* mAddWearablesGearMenu; bool mInitialized; std::auto_ptr<LLSaveOutfitComboBtn> mSaveComboBtn; LLMenuButton* mWearablesGearMenuBtn; |