diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-10-15 20:38:08 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-10-15 20:38:08 +0300 |
| commit | 7a90e71adf230f24c930a97140c19bc26f2bdcc6 (patch) | |
| tree | 49bce9ced0e51d9fd4a3a93fc8c18286b0244246 /indra/newview/llmediactrl.cpp | |
| parent | 12baf7587822bd6cd15885c45e973d0b7f9dceb4 (diff) | |
| parent | 885c56a660343beb796a74fb21cc624d0e57d2ef (diff) | |
Downstream merge from lindenlab/viewer-manul
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 6cab9b9e99..b7947288c6 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; } |