From 1108a34d1dc063eddf2b0e4991b6391a12686be7 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Tue, 8 Apr 2014 12:37:41 +0300
Subject: MAINT-3907 FIXED Handle pressing of Alt/Shift/Control keys without
 any other key being pressed simultaneously.

---
 indra/llwindow/llopenglview-objc.mm | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

(limited to 'indra/llwindow')

diff --git a/indra/llwindow/llopenglview-objc.mm b/indra/llwindow/llopenglview-objc.mm
index 017ea3769c..f7031341eb 100644
--- a/indra/llwindow/llopenglview-objc.mm
+++ b/indra/llwindow/llopenglview-objc.mm
@@ -398,9 +398,35 @@ attributedStringInfo getSegments(NSAttributedString *str)
     }
 }
 
-- (void)flagsChanged:(NSEvent *)theEvent {
+- (void)flagsChanged:(NSEvent *)theEvent
+{
 	mModifiers = [theEvent modifierFlags];
 	callModifier([theEvent modifierFlags]);
+     
+    NSInteger mask = 0;
+    switch([theEvent keyCode])
+    {        
+        case 56:
+            mask = NSShiftKeyMask;
+            break;
+        case 58:
+            mask = NSAlternateKeyMask;
+            break;
+        case 59:
+            mask = NSControlKeyMask;
+            break;
+        default:
+            return;            
+    }
+    
+    if (mModifiers & mask)
+    {
+        callKeyDown([theEvent keyCode], 0);
+    }
+    else
+    {
+        callKeyUp([theEvent keyCode], 0);
+    }  
 }
 
 - (BOOL) acceptsFirstResponder
-- 
cgit v1.3


From 7d9372b96d8eaa3df6f0b6b1aff67a4b6a710f70 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Thu, 4 Sep 2014 14:13:47 +0300
Subject: MAINT-4323 FIXED Mouselook - right-click locks cam position
 (mac-only)

---
 doc/contributions.txt               | 2 ++
 indra/llwindow/llopenglview-objc.mm | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'indra/llwindow')

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 7e8ab46b1a..e157e82aac 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1017,6 +1017,8 @@ Peekay Semyorka
 	VWR-19
 	VWR-49
 	VWR-79
+Pell Smit
+	MAINT-4323
 Peter Lameth
 	VWR-7331
 PeterPunk Mooney
diff --git a/indra/llwindow/llopenglview-objc.mm b/indra/llwindow/llopenglview-objc.mm
index f7031341eb..1bb93d05d6 100644
--- a/indra/llwindow/llopenglview-objc.mm
+++ b/indra/llwindow/llopenglview-objc.mm
@@ -349,9 +349,14 @@ attributedStringInfo getSegments(NSAttributedString *str)
 	callMiddleMouseUp(mMousePos, mModifiers);
 }
 
+- (void) rightMouseDragged:(NSEvent *)theEvent
+{
+	[self mouseDragged:theEvent];
+}
+
 - (void) otherMouseDragged:(NSEvent *)theEvent
 {
-	
+	[self mouseDragged:theEvent];        
 }
 
 - (void) scrollWheel:(NSEvent *)theEvent
-- 
cgit v1.3