diff options
author | Richard Linden <none@none> | 2011-03-10 20:20:17 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2011-03-10 20:20:17 -0800 |
commit | b815dc9aa4dc60bf405c10e426579950570d5436 (patch) | |
tree | 8422f0d03a1be5af08b14fa25f01113bab4b308d /indra/newview/lltoolpie.h | |
parent | 1898768009d9eceafc4d95e8ee291023d30be399 (diff) |
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
Diffstat (limited to 'indra/newview/lltoolpie.h')
-rw-r--r-- | indra/newview/lltoolpie.h | 15 |
1 files changed, 12 insertions, 3 deletions
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; |