diff options
author | Oz Linden <oz@lindenlab.com> | 2015-04-13 16:23:36 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2015-04-13 16:23:36 -0400 |
commit | a8ef2525711f1f9312c1c9ebb8f137f4d25e659a (patch) | |
tree | b1486d5ab0b0eddc26a7dc0f369b12f612179869 /indra/newview/llagent.cpp | |
parent | 5c6cf3e7fb9f592e3a293921175b64b515bac23f (diff) | |
parent | a647b8f1cbab13f07ea889c80df28414bc906129 (diff) |
merge changes for 3.7.27-release
Diffstat (limited to 'indra/newview/llagent.cpp')
-rwxr-xr-x | indra/newview/llagent.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index f151b15e29..359171c5bd 100755 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -398,6 +398,8 @@ LLAgent::LLAgent() : mAutoPilotFinishedCallback(NULL), mAutoPilotCallbackData(NULL), + mMovementKeysLocked(FALSE), + mEffectColor(new LLUIColor(LLColor4(0.f, 1.f, 1.f, 1.f))), mHaveHomePosition(FALSE), |