DRTVWR-476: Merge branch 'master' of lindenlab/viewer into d476

following release of D512.

1 files changed, 19 insertions, 2 deletions

diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index aeb8bdc496..f499c34ca4 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -203,14 +203,31 @@ BOOL LLToolPie::handleRightMouseUp(S32 x, S32 y, MASK mask)
 	return LLTool::handleRightMouseUp(x, y, mask);
 }
 
+BOOL LLToolPie::handleScrollWheelAny(S32 x, S32 y, S32 clicks_x, S32 clicks_y)
+{
+    BOOL res = FALSE;
+    // mHoverPick should have updated on its own and we should have a face
+    // in LLViewerMediaFocus in case of media, so just reuse mHoverPick
+    if (mHoverPick.mUVCoords.mV[VX] >= 0.f && mHoverPick.mUVCoords.mV[VY] >= 0.f)
+    {
+        res = LLViewerMediaFocus::getInstance()->handleScrollWheel(mHoverPick.mUVCoords, clicks_x, clicks_y);
+    }
+    else
+    {
+        // this won't provide correct coordinates in case of object selection
+        res = LLViewerMediaFocus::getInstance()->handleScrollWheel(x, y, clicks_x, clicks_y);
+    }
+    return res;
+}
+
 BOOL LLToolPie::handleScrollWheel(S32 x, S32 y, S32 clicks)
 {
-	return LLViewerMediaFocus::getInstance()->handleScrollWheel(x, y, clicks);
+    return handleScrollWheelAny(x, y, 0, clicks);
 }
 
 BOOL LLToolPie::handleScrollHWheel(S32 x, S32 y, S32 clicks)
 {
-    return LLViewerMediaFocus::getInstance()->handleScrollWheel(x, y, clicks);
+    return handleScrollWheelAny(x, y, clicks, 0);
 }
 
 // True if you selected an object.