summaryrefslogtreecommitdiff
path: root/indra/newview/llpanellandmarks.h
diff options
context:
space:
mode:
authorbrad kittenbrink <brad@lindenlab.com>2010-11-02 19:02:49 -0700
committerbrad kittenbrink <brad@lindenlab.com>2010-11-02 19:02:49 -0700
commit6a9e70053beaa0fb936482f5594137a8bcdf2f1e (patch)
tree9f6a44825ed0886807c4b38d9a92188261bbaf25 /indra/newview/llpanellandmarks.h
parent4902a2752e6ee5dfd47be3d94955f88bf73bf5d8 (diff)
parentaccbddaeadeec7221c9244bf1c0245b8ccbd12bc (diff)
Merge
Diffstat (limited to 'indra/newview/llpanellandmarks.h')
-rw-r--r--indra/newview/llpanellandmarks.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llpanellandmarks.h b/indra/newview/llpanellandmarks.h
index 28c19d3e5f..8dcbca0440 100644
--- a/indra/newview/llpanellandmarks.h
+++ b/indra/newview/llpanellandmarks.h
@@ -41,6 +41,7 @@ class LLAccordionCtrlTab;
class LLFolderViewItem;
class LLMenuButton;
class LLMenuGL;
+class LLToggleableMenu;
class LLInventoryPanel;
class LLPlacesInventoryPanel;
@@ -157,8 +158,8 @@ private:
LLPlacesInventoryPanel* mMyInventoryPanel;
LLPlacesInventoryPanel* mLibraryInventoryPanel;
LLMenuButton* mGearButton;
- LLMenuGL* mGearLandmarkMenu;
- LLMenuGL* mGearFolderMenu;
+ LLToggleableMenu* mGearLandmarkMenu;
+ LLToggleableMenu* mGearFolderMenu;
LLMenuGL* mMenuAdd;
LLPlacesInventoryPanel* mCurrentSelectedList;
LLInventoryObserver* mInventoryObserver;