diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-10-25 13:43:22 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-10-25 13:43:22 -0700 |
| commit | 3116e0d3525ba5cef9923a156bcbf405201b70c0 (patch) | |
| tree | 505f3a97e2c3e412bdb4a3111c1c3f087e214f25 /indra/newview/llpanellandmarks.h | |
| parent | 2a5902f75f44f5989fc7ac3f4ac5e421778a4807 (diff) | |
| parent | 54da19fdcfa3edadbc58a1f55a3503082e66f16e (diff) | |
STORM-426 : merge with 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; |