diff options
author | Oz Linden <oz@lindenlab.com> | 2010-11-08 16:47:46 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2010-11-08 16:47:46 -0500 |
commit | b657516f72f016a918e0ff627105dd380a94394c (patch) | |
tree | 7d30ace2d3cba42c5f7de1c3dd23748e31b2803f /indra/newview/llpanellandmarks.h | |
parent | 451d115c1009ded2b2d74efefbe0611c62343eed (diff) | |
parent | c446062bd3bd3f172b20f22f2086cea962fb7278 (diff) |
pull beta changes back to development
Diffstat (limited to 'indra/newview/llpanellandmarks.h')
-rw-r--r-- | indra/newview/llpanellandmarks.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llpanellandmarks.h b/indra/newview/llpanellandmarks.h index 0d4402d8cb..8dcbca0440 100644 --- a/indra/newview/llpanellandmarks.h +++ b/indra/newview/llpanellandmarks.h @@ -39,7 +39,9 @@ class LLAccordionCtrlTab; class LLFolderViewItem; +class LLMenuButton; class LLMenuGL; +class LLToggleableMenu; class LLInventoryPanel; class LLPlacesInventoryPanel; @@ -155,8 +157,9 @@ private: LLPlacesInventoryPanel* mLandmarksInventoryPanel; LLPlacesInventoryPanel* mMyInventoryPanel; LLPlacesInventoryPanel* mLibraryInventoryPanel; - LLMenuGL* mGearLandmarkMenu; - LLMenuGL* mGearFolderMenu; + LLMenuButton* mGearButton; + LLToggleableMenu* mGearLandmarkMenu; + LLToggleableMenu* mGearFolderMenu; LLMenuGL* mMenuAdd; LLPlacesInventoryPanel* mCurrentSelectedList; LLInventoryObserver* mInventoryObserver; |