From ca1d7da5718a4ad40856fe404ce89690da984f15 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Mon, 21 Mar 2016 17:58:39 +0200
Subject: MAINT-3171 Alt-clicking while moving mouse can move the camera
 significantly

---
 indra/llwindow/llwindowmacosx.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'indra/llwindow/llwindowmacosx.cpp')

diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp
index 0d41884462..8cbf5a31fb 100755
--- a/indra/llwindow/llwindowmacosx.cpp
+++ b/indra/llwindow/llwindowmacosx.cpp
@@ -343,6 +343,18 @@ void callMouseMoved(float *pos, MASK mask)
 	//gWindowImplementation->getCallbacks()->handleScrollWheel(gWindowImplementation, 0);
 }
 
+void callMouseDragged(float *pos, MASK mask)
+{
+    LLCoordGL		outCoords;
+    outCoords.mX = ll_round(pos[0]);
+    outCoords.mY = ll_round(pos[1]);
+    float deltas[2];
+    gWindowImplementation->getMouseDeltas(deltas);
+    outCoords.mX += deltas[0];
+    outCoords.mY += deltas[1];
+    gWindowImplementation->getCallbacks()->handleMouseDragged(gWindowImplementation, outCoords, gKeyboard->currentMask(TRUE));
+}
+
 void callScrollMoved(float delta)
 {
 	gWindowImplementation->getCallbacks()->handleScrollWheel(gWindowImplementation, delta);
-- 
cgit v1.2.3


From 272d40a0892108de5e54f8b440f95e4c270686a7 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Tue, 29 Mar 2016 13:30:00 +0300
Subject: MAINT-6239 [Mac] Computer cursor appears attached to crosshair after
 using modifier keys in mouselook

---
 indra/llwindow/llwindowmacosx.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'indra/llwindow/llwindowmacosx.cpp')

diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp
index 8cbf5a31fb..c6bf93507a 100755
--- a/indra/llwindow/llwindowmacosx.cpp
+++ b/indra/llwindow/llwindowmacosx.cpp
@@ -1457,8 +1457,16 @@ void LLWindowMacOSX::updateCursor()
 		mNextCursor = UI_CURSOR_WORKING;
 	}
 	
-	if(mCurrentCursor == mNextCursor)
-		return;
+    if(mCurrentCursor == mNextCursor)
+    {
+        if(mCursorHidden && isCGCursorVisible())
+        {
+            hideNSCursor();
+            mHideCursorPermanent = TRUE;
+            adjustCursorDecouple();
+        }
+        return;
+    }
 
 	// RN: replace multi-drag cursors with single versions
 	if (mNextCursor == UI_CURSOR_ARROWDRAGMULTI)
-- 
cgit v1.2.3


From c7e2c496ab413d4d9823845fedba82e67e5ed51c Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Thu, 7 Apr 2016 11:28:37 +0300
Subject: MAINT-6294 FIXED Cursor became invisible after typing in any input
 field (OS X)

---
 indra/llwindow/llwindowmacosx.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'indra/llwindow/llwindowmacosx.cpp')

diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp
index c6bf93507a..754306b5d2 100755
--- a/indra/llwindow/llwindowmacosx.cpp
+++ b/indra/llwindow/llwindowmacosx.cpp
@@ -1459,10 +1459,9 @@ void LLWindowMacOSX::updateCursor()
 	
     if(mCurrentCursor == mNextCursor)
     {
-        if(mCursorHidden && isCGCursorVisible())
+        if(mCursorHidden && mHideCursorPermanent && isCGCursorVisible())
         {
-            hideNSCursor();
-            mHideCursorPermanent = TRUE;
+            hideNSCursor();            
             adjustCursorDecouple();
         }
         return;
-- 
cgit v1.2.3