diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-10-27 15:08:21 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-10-27 15:08:21 -0400 |
| commit | 225ffbba205e832b75bed3492428ae3a0c8c7404 (patch) | |
| tree | 510681690c0c3c5e2504739453873c7ed701c658 /indra/newview/llpanellandmarks.h | |
| parent | 1aee2f0d4d16548660df4995aaf3c349304962af (diff) | |
| parent | a7143a9998f2a69d323d384558e078b05e9a73a2 (diff) | |
Automated merge up from viewer-development
Diffstat (limited to 'indra/newview/llpanellandmarks.h')
| -rw-r--r-- | indra/newview/llpanellandmarks.h | 5 |
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; |