diff options
author | Oz Linden <oz@lindenlab.com> | 2010-12-02 13:50:39 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2010-12-02 13:50:39 -0500 |
commit | 5098ca5ae444ca492bc668fbd07976e96eb5726a (patch) | |
tree | f392ec41ad1c3a44287dfff5efe6997962b9c4fc /indra/newview/llpanelplaces.h | |
parent | 37116479d299f23a289e39accc3899d6ea977203 (diff) | |
parent | 6e62c6c410df9001b56ffd57c6c6d8cd9fe035e6 (diff) |
merge fix for STORM-557
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; |