From c80df5ac39e31fb17fa8a1158cbea2de8faf0319 Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Fri, 23 Sep 2011 18:00:35 +0300 Subject: 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. --- indra/newview/lltoolpie.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'indra/newview/lltoolpie.h') 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, 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 mMouseSteerGrabPoint; bool mClockwise; bool mBlockClickToWalk; + bool mBlockClickToTeleport; + LLClickToTeleportTimer* mClickToTeleportTimer; LLUUID mMediaMouseCaptureID; LLPickInfo mPick; LLPickInfo mHoverPick; -- cgit v1.2.3 From f6a8a2c5460c8f61b37154de01cd2f9575ef87de Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Thu, 29 Sep 2011 15:35:02 +0300 Subject: STORM-1612 WIP Implemented new click-to-walk/teleport preferences design. --- indra/newview/lltoolpie.h | 7 ------- 1 file changed, 7 deletions(-) (limited to 'indra/newview/lltoolpie.h') diff --git a/indra/newview/lltoolpie.h b/indra/newview/lltoolpie.h index 7e84170549..68fe8bc4a5 100644 --- a/indra/newview/lltoolpie.h +++ b/indra/newview/lltoolpie.h @@ -32,7 +32,6 @@ #include "llviewerwindow.h" // for LLPickInfo #include "llhudeffectblob.h" // for LLPointer, apparently -class LLClickToTeleportTimer; class LLViewerObject; class LLObjectSelection; @@ -98,12 +97,8 @@ 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; @@ -114,8 +109,6 @@ private: LLPointer mMouseSteerGrabPoint; bool mClockwise; bool mBlockClickToWalk; - bool mBlockClickToTeleport; - LLClickToTeleportTimer* mClickToTeleportTimer; LLUUID mMediaMouseCaptureID; LLPickInfo mPick; LLPickInfo mHoverPick; -- cgit v1.2.3