diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-10-16 04:20:44 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-10-16 04:20:44 +0300 |
| commit | 718bd55f686945c61cd903938a2ed508d653a6e3 (patch) | |
| tree | 3d7e1174dd225ec2be452b6ad5f2e4f8fce19d5b /indra/newview/llmediactrl.cpp | |
| parent | d1411e43a9f138dd0682fd771c543815f13a9c00 (diff) | |
| parent | 0ff935ca3cadb7bffd96f3cdca9b4f0f5eafc2d8 (diff) | |
Downstream merge from lindenlab/viewer-serval
Diffstat (limited to 'indra/newview/llmediactrl.cpp')
| -rw-r--r-- | indra/newview/llmediactrl.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp index b7947288c6..6cab9b9e99 100644 --- a/indra/newview/llmediactrl.cpp +++ b/indra/newview/llmediactrl.cpp @@ -202,7 +202,10 @@ BOOL LLMediaCtrl::handleScrollWheel( S32 x, S32 y, S32 clicks ) { if (LLPanel::handleScrollWheel(x, y, clicks)) return TRUE; if (mMediaSource && mMediaSource->hasMedia()) - mMediaSource->getMediaPlugin()->scrollEvent(0, clicks, gKeyboard->currentMask(TRUE)); + { + convertInputCoords(x, y); + mMediaSource->scrollWheel(x, y, 0, clicks, gKeyboard->currentMask(TRUE)); + } return TRUE; } |