summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeenz <geenz@geenzo.com>2013-07-11 18:41:16 -0400
committerGeenz <geenz@geenzo.com>2013-07-11 18:41:16 -0400
commit6fbafaf056d61ab0ab49cc16a998a528f0ea22e8 (patch)
tree828fbe01a9d57d4fc10a9c2ec332851626539275
parentbb8ff8707c93604007c00a5227be35b2799bdb92 (diff)
Restore control + right click functionality.
-rw-r--r--indra/llwindow/llopenglview-objc.mm18
1 files changed, 12 insertions, 6 deletions
diff --git a/indra/llwindow/llopenglview-objc.mm b/indra/llwindow/llopenglview-objc.mm
index 8a6984091d..77c2fc7e19 100644
--- a/indra/llwindow/llopenglview-objc.mm
+++ b/indra/llwindow/llopenglview-objc.mm
@@ -242,12 +242,18 @@ attributedStringInfo getSegments(NSAttributedString *str)
- (void) mouseDown:(NSEvent *)theEvent
{
- if ([theEvent clickCount] >= 2)
- {
- callDoubleClick(mMousePos, mModifiers);
- } else if ([theEvent clickCount] == 1) {
- callLeftMouseDown(mMousePos, mModifiers);
- }
+ // Apparently people still use this?
+ if ([theEvent modifierFlags] & NSControlKeyMask)
+ {
+ callRightMouseDown(mMousePos, mModifiers);
+ } else {
+ if ([theEvent clickCount] >= 2)
+ {
+ callDoubleClick(mMousePos, mModifiers);
+ } else if ([theEvent clickCount] == 1) {
+ callLeftMouseDown(mMousePos, mModifiers);
+ }
+ }
}
- (void) mouseUp:(NSEvent *)theEvent