diff options
| author | Callum Prentice <callum@Callums-MacBook-Pro.local> | 2021-04-01 17:14:24 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@Callums-MacBook-Pro.local> | 2021-04-01 17:14:24 -0700 |
| commit | 645cf6a5d26b21cd873238c2ac8417d0b1abd37a (patch) | |
| tree | 2690e7dc8a233bd000f4ffd288aafcb1007006ea /indra/newview/lltoolpie.h | |
| parent | 9f95e619c9802bd405db43afa3fbf6b5ad82799d (diff) | |
| parent | 167e45e309ebeaccb346b8ca05884b8e10bf05eb (diff) | |
Merge branch 'master' into DRTVWR-519
Diffstat (limited to 'indra/newview/lltoolpie.h')
| -rw-r--r-- | indra/newview/lltoolpie.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/lltoolpie.h b/indra/newview/lltoolpie.h index 2d6c22f425..8f6100e4b4 100644 --- a/indra/newview/lltoolpie.h +++ b/indra/newview/lltoolpie.h @@ -42,7 +42,7 @@ class LLToolPie : public LLTool, public LLSingleton<LLToolPie> public: // Virtual functions inherited from LLMouseHandler - virtual BOOL handleAnyMouseClick(S32 x, S32 y, MASK mask, EClickType clicktype, BOOL down); + virtual BOOL handleAnyMouseClick(S32 x, S32 y, MASK mask, EMouseClickType clicktype, BOOL down); virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); virtual BOOL handleRightMouseDown(S32 x, S32 y, MASK mask); virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); @@ -68,8 +68,8 @@ public: LLViewerObject* getClickActionObject() { return mClickActionObject; } LLObjectSelection* getLeftClickSelection() { return (LLObjectSelection*)mLeftClickSelection; } void resetSelection(); - void walkToClickedLocation(); - void blockClickToWalk() { mBlockClickToWalk = true; } + bool walkToClickedLocation(); + bool teleportToClickedLocation(); void stopClickToWalk(); static void selectionPropertiesReceived(); @@ -111,7 +111,6 @@ private: LLPointer<LLHUDEffectBlob> mAutoPilotDestination; LLPointer<LLHUDEffectBlob> mMouseSteerGrabPoint; bool mClockwise; - bool mBlockClickToWalk; LLUUID mMediaMouseCaptureID; LLPickInfo mPick; LLPickInfo mHoverPick; |