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-objc.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/llwindow/llwindowmacosx-objc.h')

diff --git a/indra/llwindow/llwindowmacosx-objc.h b/indra/llwindow/llwindowmacosx-objc.h
index dc184b91fb..ce74fc83cc 100755
--- a/indra/llwindow/llwindowmacosx-objc.h
+++ b/indra/llwindow/llwindowmacosx-objc.h
@@ -133,6 +133,7 @@ void callLeftMouseUp(float *pos, unsigned int mask);
 void callDoubleClick(float *pos, unsigned int mask);
 void callResize(unsigned int width, unsigned int height);
 void callMouseMoved(float *pos, unsigned int mask);
+void callMouseDragged(float *pos, unsigned int mask);
 void callScrollMoved(float delta);
 void callMouseExit();
 void callWindowFocus();
-- 
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-objc.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/llwindow/llwindowmacosx-objc.h')

diff --git a/indra/llwindow/llwindowmacosx-objc.h b/indra/llwindow/llwindowmacosx-objc.h
index ce74fc83cc..507d1239be 100755
--- a/indra/llwindow/llwindowmacosx-objc.h
+++ b/indra/llwindow/llwindowmacosx-objc.h
@@ -92,6 +92,7 @@ void setCrossCursor();
 void setNotAllowedCursor();
 void hideNSCursor();
 void showNSCursor();
+bool isCGCursorVisible();
 void hideNSCursorTillMove(bool hide);
 void requestUserAttention();
 long showAlert(std::string title, std::string text, int type);
-- 
cgit v1.2.3


From c2c0c537bbf9edcbfcfa54a98c74745e5fff695a Mon Sep 17 00:00:00 2001
From: Cinder <cinder@sdf.org>
Date: Wed, 20 Apr 2016 16:13:17 -0600
Subject: STORM-2127 - Fix NSException when assigning values that don't exist
 in cocoa modifier key event.

---
 indra/llwindow/llwindowmacosx-objc.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'indra/llwindow/llwindowmacosx-objc.h')

diff --git a/indra/llwindow/llwindowmacosx-objc.h b/indra/llwindow/llwindowmacosx-objc.h
index dc184b91fb..3f55aa587e 100755
--- a/indra/llwindow/llwindowmacosx-objc.h
+++ b/indra/llwindow/llwindowmacosx-objc.h
@@ -55,13 +55,13 @@ struct NativeKeyEventData {
         KEYCHAR
     };
     
-    EventType   mKeyEvent;
-    uint32_t    mEventType;
-    uint32_t    mEventModifiers;
-    uint32_t    mEventKeyCode;
-    uint32_t    mEventChars;
-    uint32_t    mEventUnmodChars;
-    bool        mEventRepeat;
+    EventType   mKeyEvent = KEYUNKNOWN;
+    uint32_t    mEventType = 0;
+    uint32_t    mEventModifiers = 0;
+    uint32_t    mEventKeyCode = 0;
+    uint32_t    mEventChars = 0;
+    uint32_t    mEventUnmodChars = 0;
+    bool        mEventRepeat = false;
 };
 
 typedef const NativeKeyEventData * NSKeyEventRef;
-- 
cgit v1.2.3