From d2a0457777a81c75b18c5eb255e6e02d47f97a80 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 6 Dec 2011 15:35:10 -0800
Subject: EXP-1664 FIX Toolbars visible in mouselook view and when hide all
 controls selected

---
 indra/newview/lltoolbarview.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/lltoolbarview.h')

diff --git a/indra/newview/lltoolbarview.h b/indra/newview/lltoolbarview.h
index b99e8bc28d..be66bcae36 100644
--- a/indra/newview/lltoolbarview.h
+++ b/indra/newview/lltoolbarview.h
@@ -129,6 +129,7 @@ private:
 	
 	bool				mDragStarted;
 	LLToolBarButton*	mDragToolbarButton;
+	bool				mShowToolbars;
 };
 
 extern LLToolBarView* gToolBarView;
-- 
cgit v1.2.3


From c1636911c84f948e542f445d3c7495e6df185912 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 1 Feb 2012 19:09:29 -0800
Subject: EXP-1862 : Make LLClipboard an LLSingleton and clean up the internals
 (set up for toolbar and never used)

---
 indra/newview/lltoolbarview.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/newview/lltoolbarview.h')

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;
 };
 
-- 
cgit v1.2.3