diff options
author | Jacek Antonelli | 2008-12-01 17:39:58 -0600 |
---|---|---|
committer | Jacek Antonelli | 2008-12-01 17:40:06 -0600 |
commit | 7abecb48babe6a6f09bf6692ba55076546cfced9 (patch) | |
tree | 8d18a88513fb97adf32c10aae78f4be1984942db /linden/indra/newview/llinventoryview.h | |
parent | Second Life viewer sources 1.21.6 (diff) | |
download | meta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.zip meta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.tar.gz meta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.tar.bz2 meta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.tar.xz |
Second Life viewer sources 1.22.0-RC
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llinventoryview.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linden/indra/newview/llinventoryview.h b/linden/indra/newview/llinventoryview.h index a37d370..1cf8b8f 100644 --- a/linden/indra/newview/llinventoryview.h +++ b/linden/indra/newview/llinventoryview.h | |||
@@ -86,6 +86,7 @@ public: | |||
86 | static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory); | 86 | static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory); |
87 | 87 | ||
88 | // LLView methods | 88 | // LLView methods |
89 | void draw(); | ||
89 | BOOL handleHover(S32 x, S32 y, MASK mask); | 90 | BOOL handleHover(S32 x, S32 y, MASK mask); |
90 | BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, | 91 | BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, |
91 | EDragAndDropType cargo_type, | 92 | EDragAndDropType cargo_type, |
@@ -150,7 +151,8 @@ protected: | |||
150 | LLFolderView* mFolders; | 151 | LLFolderView* mFolders; |
151 | LLScrollableContainerView* mScroller; | 152 | LLScrollableContainerView* mScroller; |
152 | BOOL mAllowMultiSelect; | 153 | BOOL mAllowMultiSelect; |
153 | const std::string mSortOrderSetting; | 154 | const std::string mSortOrderSetting; |
155 | LLUUID mSelectThisID; // if non null, select this item | ||
154 | }; | 156 | }; |
155 | 157 | ||
156 | class LLInventoryView; | 158 | class LLInventoryView; |