diff options
author | Oz Linden <oz@lindenlab.com> | 2010-12-02 14:02:46 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2010-12-02 14:02:46 -0500 |
commit | 20e192029ceaf7e9b6d097d6e65089d9011a4c0b (patch) | |
tree | 3687b1fdf97d058e75565306c3214fc967839257 /indra/newview/llpanelplaces.h | |
parent | fbfe7418e567b79c60cc873a8882d9be97e3bb0a (diff) | |
parent | 5098ca5ae444ca492bc668fbd07976e96eb5726a (diff) |
merge fix for STORM-596
Diffstat (limited to 'indra/newview/llpanelplaces.h')
-rw-r--r-- | indra/newview/llpanelplaces.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpanelplaces.h b/indra/newview/llpanelplaces.h index c3b2ab806f..5523122a0f 100644 --- a/indra/newview/llpanelplaces.h +++ b/indra/newview/llpanelplaces.h @@ -47,6 +47,7 @@ class LLPlacesParcelObserver; class LLRemoteParcelInfoObserver; class LLTabContainer; class LLToggleableMenu; +class LLMenuButton; typedef std::pair<LLUUID, std::string> folder_pair_t; @@ -123,7 +124,7 @@ private: LLButton* mSaveBtn; LLButton* mCancelBtn; LLButton* mCloseBtn; - LLButton* mOverflowBtn; + LLMenuButton* mOverflowBtn; LLButton* mPlaceInfoBtn; LLPlacesInventoryObserver* mInventoryObserver; |