summaryrefslogtreecommitdiff
path: root/indra/llwindow/llopenglview-objc.mm
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2020-02-06 21:31:34 +0200
committerAndrey Lihatskiy <alihatskiy@productengine.com>2020-02-06 21:31:34 +0200
commitfa39ff67f081e2e957d2ba7fd9f014747ff10963 (patch)
treedc67779842f2a670e5c242c07e24d27ec701f8d5 /indra/llwindow/llopenglview-objc.mm
parent2076f4af0fc946c3bd79754a1deefc495ee7edb9 (diff)
parent9a3f1f6a3c4506ae08c7af7f92f11da40d80ef00 (diff)
Merge branch 'master' into DRTVWR-497
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