diff options
author | Rider Linden <rider@lindenlab.com> | 2016-09-26 10:39:21 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2016-09-26 10:39:21 -0700 |
commit | 42dce6766435da1deaea19e837629fdf38c0018d (patch) | |
tree | 063491157df3319f70c811b2b4555806fcd681f8 /indra/newview/llpanelmaininventory.h | |
parent | d258fe40353642b20524ef320b70e6b9bf0f8ec4 (diff) | |
parent | 51bb369a39142ff5049f753099f9638ce68b95dc (diff) |
Merged lindenlab/viewer-release 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 // |