diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2010-11-01 15:19:50 -0700 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2010-11-01 15:19:50 -0700 |
| commit | 9b457982305c624468aa32e06a1c0df713d0b53c (patch) | |
| tree | f6a8787782355e3ea083326ff3e1ea4ad4bc8873 /indra/newview/llpanelmaininventory.h | |
| parent | 6ab2e44e945ddc085a7b4b5f1524de924419a897 (diff) | |
| parent | 42b49397d2347b6a97394ce0b35efe5cc2ab44a2 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llpanelmaininventory.h')
| -rw-r--r-- | indra/newview/llpanelmaininventory.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index f95a99157d..d136e2d32e 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -42,6 +42,7 @@ class LLTabContainer; class LLFloaterInventoryFinder; class LLMenuButton; class LLMenuGL; +class LLToggleableMenu; class LLFloater; //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -143,7 +144,7 @@ protected: void setUploadCostIfNeeded(); private: LLDragAndDropButton* mTrashButton; - LLMenuGL* mMenuGearDefault; + LLToggleableMenu* mMenuGearDefault; LLMenuGL* mMenuAdd; LLMenuButton* mGearMenuButton; |