summaryrefslogtreecommitdiff
path: root/indra/newview/lltoolbarview.h
diff options
context:
space:
mode:
authorKitty Barnett <develop@catznip.com>2012-05-20 17:41:00 +0200
committerKitty Barnett <develop@catznip.com>2012-05-20 17:41:00 +0200
commit1300f77fdd48d90d09a05058ffdf10df93092391 (patch)
tree1cefd5cb64be5ae614b4930dcd0a55cf4fc06109 /indra/newview/lltoolbarview.h
parent8199cc997aeaccc72b5bd5389ded8afc7b9c379c (diff)
parentaa0a0542a10ba6faeca34afd6e323b505493d8dc (diff)
Merged with viewer-beta
Diffstat (limited to 'indra/newview/lltoolbarview.h')
-rw-r--r--indra/newview/lltoolbarview.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/lltoolbarview.h b/indra/newview/lltoolbarview.h
index be66bcae36..9c4194ebed 100644
--- a/indra/newview/lltoolbarview.h
+++ b/indra/newview/lltoolbarview.h
@@ -31,6 +31,7 @@
#include "lluictrl.h"
#include "lltoolbar.h"
#include "llcommandmanager.h"
+#include "llinventory.h"
class LLUICtrlFactory;
@@ -106,6 +107,7 @@ public:
static BOOL handleDragTool(S32 x, S32 y, const LLUUID& uuid, LLAssetType::EType type);
static BOOL handleDropTool(void* cargo_data, S32 x, S32 y, LLToolBar* toolbar);
static void resetDragTool(LLToolBarButton* toolbarButton);
+ LLInventoryObject* getDragItem();
bool isModified() const;
@@ -129,6 +131,7 @@ private:
bool mDragStarted;
LLToolBarButton* mDragToolbarButton;
+ LLInventoryObject* mDragItem;
bool mShowToolbars;
};