summaryrefslogtreecommitdiff
path: root/indra/llwindow/llopenglview-objc.mm
diff options
context:
space:
mode:
authorDave Houlton <euclid@lindenlab.com>2020-01-28 17:26:45 -0700
committerDave Houlton <euclid@lindenlab.com>2020-01-28 17:26:45 -0700
commit2a6b48c9b0c813c5e4ff8ac176fdf4e6c9466c22 (patch)
tree7f608467b3608127049ddc78d5045da032777cb4 /indra/llwindow/llopenglview-objc.mm
parent3e44cb06df22dd1b684dc8574c3b44d0851527bc (diff)
parent2998552f3d7447da316afdd1713595528596a0c5 (diff)
DRTVWR-440, merge in latest from 6.3.7 release
Diffstat (limited to 'indra/llwindow/llopenglview-objc.mm')
-rw-r--r--indra/llwindow/llopenglview-objc.mm2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llwindow/llopenglview-objc.mm b/indra/llwindow/llopenglview-objc.mm
index 1b0b9213a5..5b9dce02c4 100644
--- a/indra/llwindow/llopenglview-objc.mm
+++ b/indra/llwindow/llopenglview-objc.mm
@@ -467,7 +467,7 @@ attributedStringInfo getSegments(NSAttributedString *str)
- (void) scrollWheel:(NSEvent *)theEvent
{
- callScrollMoved(-[theEvent deltaY]);
+ callScrollMoved(-[theEvent deltaX], -[theEvent deltaY]);
}
- (void) mouseExited:(NSEvent *)theEvent