Merge remote branch 'thickbrick/weekly' into weekly

3 files changed, 8 insertions, 3 deletions

diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index 41f896f..80c11ce 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -339,6 +339,8 @@ Khyota Wulluf
 Kunnis Basiat
         VWR-82
         VWR-102
+Lance Corrimal
+        SNOW-717
 Lisa Lowe
         CT-218
         CT-219
diff --git a/linden/indra/newview/llmanipscale.cpp b/linden/indra/newview/llmanipscale.cpp
index 268e431..b38abe4 100644
--- a/linden/indra/newview/llmanipscale.cpp
+++ b/linden/indra/newview/llmanipscale.cpp
@@ -1523,7 +1523,7 @@ void LLManipScale::renderSnapGuides(const LLBBox& bbox)
         F32 max_subdivisions = sGridMaxSubdivisionLevel;
         F32 grid_alpha = gSavedSettings.getF32("GridOpacity");
 
-        F32 max_point_on_scale_line = partToMaxScale(mManipPart, bbox);
+        F32 max_point_on_scale_line = llmin(partToMaxScale(mManipPart, bbox), LLWorld::getInstance()->getRegionWidthInMeters());
         LLVector3 drag_point = gAgent.getPosAgentFromGlobal(mDragPointGlobal);
 
         updateGridSettings();
diff --git a/linden/indra/newview/lltoolpie.cpp b/linden/indra/newview/lltoolpie.cpp
index 296d1bb..34735a3 100644
--- a/linden/indra/newview/lltoolpie.cpp
+++ b/linden/indra/newview/lltoolpie.cpp
@@ -645,8 +645,6 @@ BOOL LLToolPie::handleHover(S32 x, S32 y, MASK mask)
         }
         */
 
-        
-        gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW);
 
         LLViewerObject *object = NULL;
         LLViewerObject *parent = NULL;
@@ -697,9 +695,14 @@ BOOL LLToolPie::handleHover(S32 x, S32 y, MASK mask)
                 {
                         gViewerWindow->getWindow()->setCursor(UI_CURSOR_HAND);
                 }
+                else
+                {
+                        gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW);
+                }
         }
         else
         {
+                gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW);
                 // We need to clear media hover flag
                 if (LLViewerMediaFocus::getInstance()->getMouseOverFlag())
                 {