summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermedia.cpp
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2019-10-16 04:20:44 +0300
committerAndreyL ProductEngine <alihatskiy@productengine.com>2019-10-16 04:20:44 +0300
commit718bd55f686945c61cd903938a2ed508d653a6e3 (patch)
tree3d7e1174dd225ec2be452b6ad5f2e4f8fce19d5b /indra/newview/llviewermedia.cpp
parentd1411e43a9f138dd0682fd771c543815f13a9c00 (diff)
parent0ff935ca3cadb7bffd96f3cdca9b4f0f5eafc2d8 (diff)
Downstream merge from lindenlab/viewer-serval
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
-rw-r--r--indra/newview/llviewermedia.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 2365f050b3..0fcc88556f 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -2317,14 +2317,14 @@ void LLViewerMediaImpl::mouseDoubleClick(S32 x, S32 y, MASK mask, S32 button)
}
//////////////////////////////////////////////////////////////////////////////////////////
-void LLViewerMediaImpl::scrollWheel(S32 x, S32 y, MASK mask)
+void LLViewerMediaImpl::scrollWheel(S32 x, S32 y, S32 scroll_x, S32 scroll_y, MASK mask)
{
scaleMouse(&x, &y);
mLastMouseX = x;
mLastMouseY = y;
if (mMediaSource)
{
- mMediaSource->scrollEvent(x, y, mask);
+ mMediaSource->scrollEvent(x, y, scroll_x, scroll_y, mask);
}
}