From dea416fd83497d22147b3c0abab1bf1240e472dd Mon Sep 17 00:00:00 2001 From: Geenz Date: Thu, 11 Jul 2013 22:07:17 -0400 Subject: Rework the command+click functionality a bit to ensure we're not mistakenly simulating a right click where we shouldn't. --- indra/llwindow/llopenglview-objc.mm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'indra') 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; -- cgit v1.2.3