diff options
author | Monroe Linden <monroe@lindenlab.com> | 2009-10-29 16:10:37 -0700 |
---|---|---|
committer | Monroe Linden <monroe@lindenlab.com> | 2009-10-29 16:10:37 -0700 |
commit | 8357fe51aa034d823ba2f7c0465f4f8f8065fc1a (patch) | |
tree | 0edd109b064c387cf32257961731a07086c4dcf1 /indra/newview/llviewermedia.cpp | |
parent | 4d1a2ef2d1d521ccdf5150f76ef5ce7597aded28 (diff) |
Added LLViewerMediaImpl::scrollWheel() to route scroll wheel events through the media impl.
The horizontal scroll arrows in the media controls now send horizontal scrollwheel events instead of arrow keys.
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
-rw-r--r-- | indra/newview/llviewermedia.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 20e9208a4e..e2d9f5a2c9 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -1119,6 +1119,18 @@ void LLViewerMediaImpl::mouseDoubleClick(S32 x, S32 y, MASK mask, S32 button) } ////////////////////////////////////////////////////////////////////////////////////////// +void LLViewerMediaImpl::scrollWheel(S32 x, S32 y, MASK mask) +{ + scaleMouse(&x, &y); + mLastMouseX = x; + mLastMouseY = y; + if (mMediaSource) + { + mMediaSource->scrollEvent(x, y, mask); + } +} + +////////////////////////////////////////////////////////////////////////////////////////// void LLViewerMediaImpl::onMouseCaptureLost() { if (mMediaSource) |