diff options
author | brad kittenbrink <brad@lindenlab.com> | 2010-11-02 19:02:49 -0700 |
---|---|---|
committer | brad kittenbrink <brad@lindenlab.com> | 2010-11-02 19:02:49 -0700 |
commit | 6a9e70053beaa0fb936482f5594137a8bcdf2f1e (patch) | |
tree | 9f6a44825ed0886807c4b38d9a92188261bbaf25 /indra/newview/llpaneloutfitedit.h | |
parent | 4902a2752e6ee5dfd47be3d94955f88bf73bf5d8 (diff) | |
parent | accbddaeadeec7221c9244bf1c0245b8ccbd12bc (diff) |
Merge
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; |