diff options
author | Ruslan Teliuk <ruslantproductengine@lindenlab.com> | 2016-09-27 15:43:53 +0300 |
---|---|---|
committer | Ruslan Teliuk <ruslantproductengine@lindenlab.com> | 2016-09-27 15:43:53 +0300 |
commit | 999dc6c61ba48c5bd930e63bfc6dc7d1e494b43c (patch) | |
tree | 5c0f00f9521aa0298ff2813d5116cf4b12a04597 /indra/newview/llpanelmaininventory.h | |
parent | 25c20f98a88a457b5fa865e8dc302b24378bc842 (diff) | |
parent | fa4376b457b887130e98bd96e6bccb231e8947d2 (diff) |
Merged lindenlab/viewer-neko into default
Diffstat (limited to 'indra/newview/llpanelmaininventory.h')
-rw-r--r-- | indra/newview/llpanelmaininventory.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index 290e2e5f47..efa18b42c1 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -156,8 +156,8 @@ protected: private: LLDragAndDropButton* mTrashButton; LLToggleableMenu* mMenuGearDefault; - LLMenuGL* mMenuAdd; LLMenuButton* mGearMenuButton; + LLHandle<LLView> mMenuAddHandle; bool mNeedUploadCost; // List Commands // |