diff options
author | callum_linden <none@none> | 2015-05-18 12:00:36 -0700 |
---|---|---|
committer | callum_linden <none@none> | 2015-05-18 12:00:36 -0700 |
commit | 80aa29eaec78d267b4fa1822cfbd3a33b268066a (patch) | |
tree | 1ce0483bd490750e367bfe53a19ec312cdc0bd27 /indra/newview/llagent.cpp | |
parent | d214c2854110520d5574f675bcc12f64bfd42090 (diff) | |
parent | fde0868231a25b8c9ce03a86cb53f1738d35688d (diff) |
Merge with Viewer Release (after Viewer Release updated with Viewer Tools Update)
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), |