From 0ff935ca3cadb7bffd96f3cdca9b4f0f5eafc2d8 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Wed, 16 Oct 2019 01:37:15 +0300
Subject: Brought back the changes from @andreyk for improved mouse scroll
 wheel performance (previously 8e228364f324)

---
 indra/newview/llmediactrl.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llmediactrl.cpp')

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;
 }
-- 
cgit v1.3