summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2014-09-04 14:13:47 +0300
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2014-09-04 14:13:47 +0300
commit7d9372b96d8eaa3df6f0b6b1aff67a4b6a710f70 (patch)
treeaaaf3bc7b642f96026313bda42988944ced20398
parent9ffa7471bb9e611440e3c12e654b83dfbead2e83 (diff)
MAINT-4323 FIXED Mouselook - right-click locks cam position (mac-only)
-rwxr-xr-xdoc/contributions.txt2
-rw-r--r--indra/llwindow/llopenglview-objc.mm7
2 files changed, 8 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 7e8ab46b1a..e157e82aac 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1017,6 +1017,8 @@ Peekay Semyorka
VWR-19
VWR-49
VWR-79
+Pell Smit
+ MAINT-4323
Peter Lameth
VWR-7331
PeterPunk Mooney
diff --git a/indra/llwindow/llopenglview-objc.mm b/indra/llwindow/llopenglview-objc.mm
index f7031341eb..1bb93d05d6 100644
--- a/indra/llwindow/llopenglview-objc.mm
+++ b/indra/llwindow/llopenglview-objc.mm
@@ -349,9 +349,14 @@ attributedStringInfo getSegments(NSAttributedString *str)
callMiddleMouseUp(mMousePos, mModifiers);
}
+- (void) rightMouseDragged:(NSEvent *)theEvent
+{
+ [self mouseDragged:theEvent];
+}
+
- (void) otherMouseDragged:(NSEvent *)theEvent
{
-
+ [self mouseDragged:theEvent];
}
- (void) scrollWheel:(NSEvent *)theEvent