diff options
Diffstat (limited to 'linden/indra/newview/llinventoryview.h')
-rw-r--r-- | linden/indra/newview/llinventoryview.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/linden/indra/newview/llinventoryview.h b/linden/indra/newview/llinventoryview.h index dd6756a..bdc24e0 100644 --- a/linden/indra/newview/llinventoryview.h +++ b/linden/indra/newview/llinventoryview.h | |||
@@ -5,7 +5,7 @@ | |||
5 | * | 5 | * |
6 | * $LicenseInfo:firstyear=2001&license=viewergpl$ | 6 | * $LicenseInfo:firstyear=2001&license=viewergpl$ |
7 | * | 7 | * |
8 | * Copyright (c) 2001-2008, Linden Research, Inc. | 8 | * Copyright (c) 2001-2009, Linden Research, Inc. |
9 | * | 9 | * |
10 | * Second Life Viewer Source Code | 10 | * Second Life Viewer Source Code |
11 | * The source code in this file ("Source Code") is provided by Linden Lab | 11 | * The source code in this file ("Source Code") is provided by Linden Lab |
@@ -87,6 +87,7 @@ public: | |||
87 | static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory); | 87 | static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory); |
88 | 88 | ||
89 | // LLView methods | 89 | // LLView methods |
90 | void draw(); | ||
90 | BOOL handleHover(S32 x, S32 y, MASK mask); | 91 | BOOL handleHover(S32 x, S32 y, MASK mask); |
91 | BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, | 92 | BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, |
92 | EDragAndDropType cargo_type, | 93 | EDragAndDropType cargo_type, |
@@ -154,7 +155,8 @@ protected: | |||
154 | LLFolderView* mFolders; | 155 | LLFolderView* mFolders; |
155 | LLScrollableContainerView* mScroller; | 156 | LLScrollableContainerView* mScroller; |
156 | BOOL mAllowMultiSelect; | 157 | BOOL mAllowMultiSelect; |
157 | const std::string mSortOrderSetting; | 158 | const std::string mSortOrderSetting; |
159 | LLUUID mSelectThisID; // if non null, select this item | ||
158 | }; | 160 | }; |
159 | 161 | ||
160 | class LLInventoryView; | 162 | class LLInventoryView; |