diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-03 09:37:03 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-03 09:37:03 -0400 |
| commit | b8e97adced58f81a52e6b76a14309d275d55c8bc (patch) | |
| tree | 9f2710cbb13093c509896f184a025ab7469c934c /indra/newview/lltoolpie.h | |
| parent | abc259618f06f69ba8e7c72cb149bcddc1bb6ddf (diff) | |
| parent | e58c809a5816383674d0f1957440fad728e88893 (diff) | |
merge changes for OPEN-39
Diffstat (limited to 'indra/newview/lltoolpie.h')
| -rw-r--r-- | indra/newview/lltoolpie.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lltoolpie.h b/indra/newview/lltoolpie.h index 22e77a3159..22359a6db8 100644 --- a/indra/newview/lltoolpie.h +++ b/indra/newview/lltoolpie.h @@ -66,6 +66,7 @@ public: LLViewerObject* getClickActionObject() { return mClickActionObject; } LLObjectSelection* getLeftClickSelection() { return (LLObjectSelection*)mLeftClickSelection; } void resetSelection(); + void blockClickToWalk() { mBlockClickToWalk = true; } static void selectionPropertiesReceived(); @@ -105,7 +106,7 @@ private: LLPointer<LLHUDEffectBlob> mAutoPilotDestination; LLPointer<LLHUDEffectBlob> mMouseSteerGrabPoint; bool mClockwise; - bool mAbortClickToWalk; + bool mBlockClickToWalk; LLUUID mMediaMouseCaptureID; LLPickInfo mPick; LLPickInfo mHoverPick; |