summaryrefslogtreecommitdiff
path: root/indra/newview/llagent.h
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2014-12-03 11:58:41 +0200
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2014-12-03 11:58:41 +0200
commit0a32de770d6ec82bb89b86d0d278470602eeb355 (patch)
treea258da3c3f11333365f5ca51bd0127841cb8cb38 /indra/newview/llagent.h
parent8c8bef36c049e78cc524e71fb6f740426fb3ce70 (diff)
MAINT-1871 FIXED Don't allow moving avatar while changing camera position.
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
** **