From 1d15c37689b15b2005ff97738e259d63b7e6c446 Mon Sep 17 00:00:00 2001
From: thickbrick
Date: Sat, 20 Nov 2010 14:13:19 +0200
Subject: Fix #705 (SNOW-717): Prevent mouse cursor flicker

Patch by Lance Corrimal taken from SNOW-717.
---
 linden/doc/contributions.txt       | 2 ++
 linden/indra/newview/lltoolpie.cpp | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index cd6544a..bb1c98b 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -338,6 +338,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/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())
 		{
-- 
cgit v1.1


From 0e81c179bc3d4f0b5eef09eb368a1662c7feb4fd Mon Sep 17 00:00:00 2001
From: thickbrick
Date: Sat, 20 Nov 2010 14:55:44 +0200
Subject: Fix #724: Snap guides in scale manipulator not shown.

---
 linden/indra/newview/llmanipscale.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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();
-- 
cgit v1.1