From b815dc9aa4dc60bf405c10e426579950570d5436 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 10 Mar 2011 20:20:17 -0800
Subject: SOCIAL-530 WIP When double clicking a nearby location I want my
 avatar to walk to that spot Initial mouse-based steering and single click to
 walk

---
 indra/newview/lltoolpie.h | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'indra/newview/lltoolpie.h')

diff --git a/indra/newview/lltoolpie.h b/indra/newview/lltoolpie.h
index 77200a1da4..c46fdd6799 100644
--- a/indra/newview/lltoolpie.h
+++ b/indra/newview/lltoolpie.h
@@ -75,8 +75,8 @@ public:
 	
 private:
 	BOOL outsideSlop		(S32 x, S32 y, S32 start_x, S32 start_y);
-	BOOL pickLeftMouseDownCallback();
-	BOOL pickRightMouseDownCallback();
+	BOOL handleLeftClickPick();
+	BOOL handleRightClickPick();
 	BOOL useClickAction		(MASK mask, LLViewerObject* object,LLViewerObject* parent);
 	
 	void showVisualContextMenuEffect();
@@ -88,12 +88,21 @@ private:
 	BOOL handleTooltipLand(std::string line, std::string tooltip_msg);
 	BOOL handleTooltipObject( LLViewerObject* hover_object, std::string line, std::string tooltip_msg);
 
+	void steerCameraWithMouse(S32 x, S32 y);
+	void startCameraSteering();
+
 private:
-	BOOL				mGrabMouseButtonDown;
+	BOOL				mMouseButtonDown;
 	BOOL				mMouseOutsideSlop;				// for this drag, has mouse moved outside slop region
+	S32					mMouseDownX;
+	S32					mMouseDownY;
+	S32					mMouseSteerX;
+	S32					mMouseSteerY;
+	F32					mLastYaw;
 	LLUUID				mMediaMouseCaptureID;
 	LLPickInfo			mPick;
 	LLPickInfo			mHoverPick;
+	LLPickInfo			mDragPick;
 	LLPointer<LLViewerObject> mClickActionObject;
 	U8					mClickAction;
 	LLSafeHandle<LLObjectSelection> mLeftClickSelection;
-- 
cgit v1.2.3


From 1c5d2516e0d926c8bd0bc2faad0f8ccaa2725339 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 11 Mar 2011 00:21:22 -0800
Subject: SOCIAL-530 WIP When double clicking a nearby location I want my
 avatar to walk to that spot can drag objects in front of avatar in opposite
 direction now reliably release mouse capture min rotation radius is now
 scaled by camera distance from rotation center

---
 indra/newview/lltoolpie.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/lltoolpie.h')

diff --git a/indra/newview/lltoolpie.h b/indra/newview/lltoolpie.h
index c46fdd6799..26dcbd35e6 100644
--- a/indra/newview/lltoolpie.h
+++ b/indra/newview/lltoolpie.h
@@ -92,13 +92,13 @@ private:
 	void startCameraSteering();
 
 private:
-	BOOL				mMouseButtonDown;
-	BOOL				mMouseOutsideSlop;				// for this drag, has mouse moved outside slop region
+	bool				mMouseButtonDown;
+	bool				mMouseOutsideSlop;		// for this drag, has mouse moved outside slop region
 	S32					mMouseDownX;
 	S32					mMouseDownY;
 	S32					mMouseSteerX;
 	S32					mMouseSteerY;
-	F32					mLastYaw;
+	bool				mClockwise;					
 	LLUUID				mMediaMouseCaptureID;
 	LLPickInfo			mPick;
 	LLPickInfo			mHoverPick;
-- 
cgit v1.2.3