diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2010-11-02 19:02:49 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2010-11-02 19:02:49 -0700 |
| commit | 6a9e70053beaa0fb936482f5594137a8bcdf2f1e (patch) | |
| tree | 9f6a44825ed0886807c4b38d9a92188261bbaf25 /indra/newview/llpanelmaininventory.h | |
| parent | 4902a2752e6ee5dfd47be3d94955f88bf73bf5d8 (diff) | |
| parent | accbddaeadeec7221c9244bf1c0245b8ccbd12bc (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; |