diff options
author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-01 11:08:44 -0700 |
---|---|---|
committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-01 11:08:44 -0700 |
commit | 52708727f4bd1bf98d0ee727a15689e7c65d965d (patch) | |
tree | daf0e802de6abf26c098a3510d9cef40bb866218 /indra/newview/llviewercontrol.cpp | |
parent | a6ff5974c36f8ea860b2065c549333d8cfc6a458 (diff) | |
parent | 3e5819d86226d6b3d5fbd24db701c6f57f607b39 (diff) |
Merge with SVN viewer-2.0.0-3 branch
Diffstat (limited to 'indra/newview/llviewercontrol.cpp')
-rw-r--r-- | indra/newview/llviewercontrol.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp index 2c1707e49f..be832ebe32 100644 --- a/indra/newview/llviewercontrol.cpp +++ b/indra/newview/llviewercontrol.cpp @@ -470,6 +470,19 @@ bool handleVelocityInterpolate(const LLSD& newvalue) return true; } +bool toggle_agent_pause(const LLSD& newvalue) +{ + if ( newvalue.asBoolean() ) + { + send_agent_pause(); + } + else + { + send_agent_resume(); + } + return true; +} + //////////////////////////////////////////////////////////////////////////// void settings_setup_listeners() @@ -601,6 +614,7 @@ void settings_setup_listeners() gSavedSettings.getControl("VelocityInterpolate")->getSignal()->connect(boost::bind(&handleVelocityInterpolate, _2)); gSavedSettings.getControl("QAMode")->getSignal()->connect(boost::bind(&show_debug_menus)); gSavedSettings.getControl("UseDebugMenus")->getSignal()->connect(boost::bind(&show_debug_menus)); + gSavedSettings.getControl("AgentPause")->getSignal()->connect(boost::bind(&toggle_agent_pause, _2)); } #if TEST_CACHED_CONTROL |