diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2013-07-26 09:00:01 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2013-07-26 09:00:01 -0400 |
commit | 1bcce503a958e39d92206e8e0539fe664fdd1ece (patch) | |
tree | f74e53e37177d39b243a9c66a69d6a6a8badaf9a /indra/newview/llagent.cpp | |
parent | 10c8fbbedbee07355f71ef206c50957a422d7ccf (diff) | |
parent | f7cdbb2582d6328e62220dc4955c89bafcad5565 (diff) |
Automated merge with ssh://hg.lindenlab.com/nat/viewer-chop-951
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. |