STORM-1612 FIXED Implemented click-to-walk in Advanced mode.

Changes:
* Click and double click in-world can now trigger click-to-walk or
  click-to-teleport actions, depending on preferences.
* Grouped keyboard- and mouse-related settings in Preferences -> Move.

1 files changed, 8 insertions, 0 deletions

diff --git a/indra/newview/lltoolpie.h b/indra/newview/lltoolpie.h
index d7c79ee223..7e84170549 100644
--- a/indra/newview/lltoolpie.h
+++ b/indra/newview/lltoolpie.h
@@ -32,6 +32,7 @@
 #include "llviewerwindow.h" // for LLPickInfo
 #include "llhudeffectblob.h" // for LLPointer<LLHudEffectBlob>, apparently
 
+class LLClickToTeleportTimer;
 class LLViewerObject;
 class LLObjectSelection;
 
@@ -66,6 +67,7 @@ public:
 	LLViewerObject*		getClickActionObject() { return mClickActionObject; }
 	LLObjectSelection*	getLeftClickSelection() { return (LLObjectSelection*)mLeftClickSelection; }
 	void 				resetSelection();
+	void				walkToClickedLocation();
 	void				blockClickToWalk() { mBlockClickToWalk = true; }
 	void				stopClickToWalk();
 	
@@ -96,8 +98,12 @@ private:
 	void startCameraSteering();
 	void stopCameraSteering();
 	bool inCameraSteerMode();
+	void scheduleTeleport(const LLVector3d& pos);
+	void cancelScheduledTeleport();
 
 private:
+	friend class LLClickToTeleportTimer;
+
 	bool				mMouseButtonDown;
 	bool				mMouseOutsideSlop;		// for this drag, has mouse moved outside slop region
 	S32					mMouseDownX;
@@ -108,6 +114,8 @@ private:
 	LLPointer<LLHUDEffectBlob>	mMouseSteerGrabPoint;
 	bool				mClockwise;			
 	bool				mBlockClickToWalk;
+	bool				mBlockClickToTeleport;
+	LLClickToTeleportTimer*	mClickToTeleportTimer;
 	LLUUID				mMediaMouseCaptureID;
 	LLPickInfo			mPick;
 	LLPickInfo			mHoverPick;