merge changes for 3.7.17-release

1 files changed, 31 insertions, 0 deletions

diff --git a/indra/llwindow/llopenglview-objc.mm b/indra/llwindow/llopenglview-objc.mm
index b5983504f5..14b0a847f8 100644
--- a/indra/llwindow/llopenglview-objc.mm
+++ b/indra/llwindow/llopenglview-objc.mm
@@ -403,6 +403,37 @@ attributedStringInfo getSegments(NSAttributedString *str)
     }
 }
 
+- (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
 {
 	return YES;