diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-10-15 20:36:12 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-10-15 20:36:12 +0300 |
| commit | 885c56a660343beb796a74fb21cc624d0e57d2ef (patch) | |
| tree | 898667e50fb2a13d3b22f8484367ccbc7929d748 /indra/newview/llmediactrl.cpp | |
| parent | 9666a96e68cb6b75031051fc43f44b2c566b135c (diff) | |
| parent | 35d3901b99111f52f8ed236f4790a809f500bd44 (diff) | |
Downstream merge from lindenlab/viewer-bear
Diffstat (limited to 'indra/newview/llmediactrl.cpp')
| -rw-r--r-- | indra/newview/llmediactrl.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp index 1d3a026049..7f6955d08c 100644 --- a/indra/newview/llmediactrl.cpp +++ b/indra/newview/llmediactrl.cpp @@ -202,10 +202,7 @@ BOOL LLMediaCtrl::handleScrollWheel( S32 x, S32 y, S32 clicks ) { if (LLPanel::handleScrollWheel(x, y, clicks)) return TRUE; if (mMediaSource && mMediaSource->hasMedia()) - { - convertInputCoords(x, y); - mMediaSource->scrollWheel(x, y, 0, clicks, gKeyboard->currentMask(TRUE)); - } + mMediaSource->getMediaPlugin()->scrollEvent(0, clicks, gKeyboard->currentMask(TRUE)); return TRUE; } |