Merge branch 'master' into DRTVWR-483

1 files changed, 26 insertions, 2 deletions

diff --git a/indra/newview/llpanelprimmediacontrols.cpp b/indra/newview/llpanelprimmediacontrols.cpp
index 6e61584d33..55c84815aa 100644
--- a/indra/newview/llpanelprimmediacontrols.cpp
+++ b/indra/newview/llpanelprimmediacontrols.cpp
@@ -829,8 +829,32 @@ void LLPanelPrimMediaControls::draw()
 
 BOOL LLPanelPrimMediaControls::handleScrollWheel(S32 x, S32 y, S32 clicks)
 {
-	mInactivityTimer.start();
-	return LLViewerMediaFocus::getInstance()->handleScrollWheel(x, y, clicks);
+    mInactivityTimer.start();
+    BOOL res = FALSE;
+
+    // Unlike other mouse events, we need to handle scroll here otherwise
+    // it will be intercepted by camera and won't reach toolpie
+    if (LLViewerMediaFocus::getInstance()->isHoveringOverFocused())
+    {
+        // either let toolpie handle this or expose mHoverPick.mUVCoords in some way
+        res = LLToolPie::getInstance()->handleScrollWheel(x, y, clicks);
+    }
+
+    return res;
+}
+
+BOOL LLPanelPrimMediaControls::handleScrollHWheel(S32 x, S32 y, S32 clicks)
+{
+    mInactivityTimer.start();
+    BOOL res = FALSE;
+
+    if (LLViewerMediaFocus::getInstance()->isHoveringOverFocused())
+    {
+        // either let toolpie handle this or expose mHoverPick.mUVCoords in some way
+        res = LLToolPie::getInstance()->handleScrollHWheel(x, y, clicks);
+    }
+
+    return res;
 }
 
 BOOL LLPanelPrimMediaControls::handleMouseDown(S32 x, S32 y, MASK mask)