diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2013-08-05 19:44:12 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2013-08-05 19:44:12 -0400 |
commit | f4943bb2e6d59103d6e6a511ff8f06adb1c90a41 (patch) | |
tree | f0b89a006e52e38039d142048adf9034cbcb2b76 /indra/newview/llagent.cpp | |
parent | 32b8d398eca5eaa4ca99aa48839ad64d97954cae (diff) | |
parent | 7f6e7fc0cb15d5367d48a3d8084d1a0b319575b7 (diff) |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llagent.cpp')
-rwxr-xr-x | indra/newview/llagent.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 3e94c5edf7..05f3824485 100755 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -433,7 +433,7 @@ void LLAgent::init() { mMoveTimer.start(); - gSavedSettings.declareBOOL("SlowMotionAnimation", FALSE, "Declared in code", FALSE); + gSavedSettings.declareBOOL("SlowMotionAnimation", FALSE, "Declared in code", LLControlVariable::PERSIST_NO); gSavedSettings.getControl("SlowMotionAnimation")->getSignal()->connect(boost::bind(&handleSlowMotionAnimation, _2)); // *Note: this is where LLViewerCamera::getInstance() used to be constructed. |