From 8f891279000601a316b9a8f707d77c307209c78a Mon Sep 17 00:00:00 2001 From: Router Gray Date: Wed, 26 Feb 2020 23:24:36 -0600 Subject: [PATCH] [CEF] Catch a missed change for dullahan update. OCDly fix an indentation. --- indra/newview/llmediactrl.cpp | 5 ++++- indra/newview/llpanelprimmediacontrols.cpp | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp index cac03fe40..fe5b50253 100644 --- a/indra/newview/llmediactrl.cpp +++ b/indra/newview/llmediactrl.cpp @@ -207,7 +207,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(x, y, 0, clicks, gKeyboard->currentMask(TRUE)); + { + convertInputCoords(x, y); + mMediaSource->scrollWheel(x, y, 0, clicks, gKeyboard->currentMask(TRUE)); + } return TRUE; } diff --git a/indra/newview/llpanelprimmediacontrols.cpp b/indra/newview/llpanelprimmediacontrols.cpp index 47eac453f..79237f806 100644 --- a/indra/newview/llpanelprimmediacontrols.cpp +++ b/indra/newview/llpanelprimmediacontrols.cpp @@ -566,7 +566,7 @@ void LLPanelPrimMediaControls::updateShape() // media_impl->handleKeyHere(KEY_RIGHT, MASK_NONE); break; case SCROLL_NONE: - default: + default: break; } }