1 files changed, 7 insertions, 1 deletions
diff --git a/indra/llwindow/llopenglview-objc.mm b/indra/llwindow/llopenglview-objc.mm
index 42ad4f8723..5f34d03c35 100644
--- a/indra/llwindow/llopenglview-objc.mm
+++ b/indra/llwindow/llopenglview-objc.mm
@@ -243,7 +243,13 @@ attributedStringInfo getSegments(NSAttributedString *str)
 - (void) mouseDown:(NSEvent *)theEvent
 {
     // Apparently people still use this?
-    if ([theEvent modifierFlags] & NSControlKeyMask)
+    if ([theEvent modifierFlags] & NSCommandKeyMask &&
+        !([theEvent modifierFlags] & NSControlKeyMask) &&
+        !([theEvent modifierFlags] & NSShiftKeyMask) &&
+        !([theEvent modifierFlags] & NSAlternateKeyMask) &&
+        !([theEvent modifierFlags] & NSAlphaShiftKeyMask) &&
+        !([theEvent modifierFlags] & NSFunctionKeyMask) &&
+        !([theEvent modifierFlags] & NSHelpKeyMask))
     {
         callRightMouseDown(mMousePos, mModifiers);
         mSimulatedRightClick = true;