diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-10-16 01:37:15 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-10-16 01:37:15 +0300 |
| commit | 0ff935ca3cadb7bffd96f3cdca9b4f0f5eafc2d8 (patch) | |
| tree | a602782a3a4d422ea72368fedc6d40d72cf0544c /indra/newview/llviewermedia.cpp | |
| parent | 910fea5470db18927573d36fe9c7b80a3c499db3 (diff) | |
Brought back the changes from @andreyk for improved mouse scroll wheel performance (previously 8e228364f324)
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 4 |
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); } } |