diff options
| author | callum_linden <none@none> | 2019-06-10 14:09:31 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2019-06-10 14:09:31 -0700 |
| commit | 7bce446b28fc7f7f93b2c4927dac2f9da0835264 (patch) | |
| tree | 580586202d78518f49fdc903f11100891d5de2cf /indra/newview/llmediactrl.cpp | |
| parent | 2672194b1d3eb03648861a29e57d81a38f527746 (diff) | |
Changes from @andreyk for improved mouse scroll wheel performance and pull in new Dullahan with CEF 74.1.19_gb62bacf_chromium-74.0.3729.157
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 7f6955d08c..1d3a026049 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; } |