summaryrefslogtreecommitdiff
path: root/indra/newview/llagent.h
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2015-04-13 17:19:27 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2015-04-13 17:19:27 -0400
commit32940ee90b6dae898f83cf99516f18f106246ace (patch)
tree1fca162d8adc5b7aed5a0193627d6caf773f09fd /indra/newview/llagent.h
parentcddfcda1677c4a5d25d2adc54eb4c3aef0953ee1 (diff)
parenta647b8f1cbab13f07ea889c80df28414bc906129 (diff)
merge
Diffstat (limited to 'indra/newview/llagent.h')
-rwxr-xr-xindra/newview/llagent.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index a2e9cedd88..33088283da 100755
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -515,6 +515,9 @@ public:
void moveYaw(F32 mag, bool reset_view = true);
void movePitch(F32 mag);
+ BOOL isMovementLocked() const { return mMovementKeysLocked; }
+ void setMovementLocked(BOOL set_locked) { mMovementKeysLocked = set_locked; }
+
//--------------------------------------------------------------------
// Move the avatar's frame
//--------------------------------------------------------------------
@@ -569,6 +572,7 @@ private:
void (*mAutoPilotFinishedCallback)(BOOL, void *);
void* mAutoPilotCallbackData;
LLUUID mLeaderID;
+ BOOL mMovementKeysLocked;
/** Movement
** **