From 998ccb3fee34a4e87d4885c4f2a984e673ece72f Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sun, 8 Feb 2015 02:11:07 +0100
Subject: [PATCH] FIRE-15500: Restore fix for FIRE-11648 that got lost in the
 merge with LL V3.7.21

---
 indra/llwindow/llopenglview-objc.mm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/indra/llwindow/llopenglview-objc.mm b/indra/llwindow/llopenglview-objc.mm
index b3a9a666ae..a7da64a712 100644
--- a/indra/llwindow/llopenglview-objc.mm
+++ b/indra/llwindow/llopenglview-objc.mm
@@ -443,10 +443,12 @@ attributedStringInfo getSegments(NSAttributedString *str)
     // OS X intentionally does not send us key-up information on cmd-key combinations.
     // This behaviour is not a bug, and only applies to cmd-combinations (no others).
     // Since SL assumes we receive those, we fake it here.
-    if (mModifiers & NSCommandKeyMask && !mHasMarkedText)
-    {
-        callKeyUp([theEvent keyCode], mModifiers);
-    }
+    // <FS:Ansariel> Cinder Roxley's fix for FIRE-11648
+    //if (mModifiers & NSCommandKeyMask && !mHasMarkedText)
+    //{
+    //    callKeyUp([theEvent keyCode], mModifiers);
+    //}
+    // </FS:Ansariel>
 }
 
 - (void)flagsChanged:(NSEvent *)theEvent