From 873543bd88e1461ffadbc95ee215a1654e813261 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Wed, 2 Apr 2014 13:06:53 +0300
Subject: MAINT-2536 FIXED Ignore selectTool( gGrabTransientTool ) if mouse
 down is handled in mouselook and mouse up event is not handled in this mode.

---
 indra/newview/lltoolgrab.h | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/indra/newview/lltoolgrab.h b/indra/newview/lltoolgrab.h
index 06a3b662c8..5107716aab 100755
--- a/indra/newview/lltoolgrab.h
+++ b/indra/newview/lltoolgrab.h
@@ -133,6 +133,8 @@ private:
 	LLQuaternion	mSpinRotation;
 
 	BOOL			mHideBuildHighlight;
+
+	BOOL			mClickedInMouselook;
 };
 
 extern BOOL gGrabBtnVertical;
-- 
cgit v1.2.3


From 3686dc3e37511009be02b61edcd483cb9a032b1b Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Mon, 16 Jun 2014 20:38:43 +0300
Subject: MAINT-3634 FIXED After right-clicking another avatars nametag or
 avatar then pressing the "Alt" key, most options in the dropdown menu will no
 longer function.

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

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

diff --git a/indra/newview/lltoolgrab.h b/indra/newview/lltoolgrab.h
index 5107716aab..4e22732124 100755
--- a/indra/newview/lltoolgrab.h
+++ b/indra/newview/lltoolgrab.h
@@ -119,6 +119,7 @@ private:
 	BOOL			mHasMoved;		// has mouse moved off center at all?
 	BOOL			mOutsideSlop;	// has mouse moved outside center 5 pixels?
 	BOOL			mDeselectedThisClick;
+	BOOL			mValidSelection;
 
 	S32             mLastFace;
 	LLVector2       mLastUVCoords;
-- 
cgit v1.2.3