diff options
| author | Adam Moss <moss@lindenlab.com> | 2008-04-22 16:17:22 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2008-04-22 16:17:22 +0000 |
| commit | c01edec021194bacb86dc9a3f5a3cc655a8cb15f (patch) | |
| tree | 51ea1eb3d76bb4af627b7b645629659eb0f0f347 /indra/newview/llviewercontrol.cpp | |
| parent | 06e8af59a92a1341e5ff343d49d341127d67de8c (diff) | |
QAR-468 "Babble Lipsync MergeMe"
svn merge -c85508
svn+ssh://svn.lindenlab.com/svn/linden/branches/babble-merge1-r85500
Diffstat (limited to 'indra/newview/llviewercontrol.cpp')
| -rw-r--r-- | indra/newview/llviewercontrol.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp index 69e611fd99..b834eb7e2e 100644 --- a/indra/newview/llviewercontrol.cpp +++ b/indra/newview/llviewercontrol.cpp @@ -426,6 +426,7 @@ bool handleVoiceClientPrefsChanged(const LLSD& newvalue) gVoiceClient->setCaptureDevice(inputDevice); std::string outputDevice = gSavedSettings.getString("VoiceOutputAudioDevice"); gVoiceClient->setRenderDevice(outputDevice); + gVoiceClient->setLipSyncEnabled(gSavedSettings.getU32("LipSyncEnabled")); } return true; } @@ -555,5 +556,6 @@ void settings_setup_listeners() gSavedSettings.getControl("VivoxDebugServerName")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1)); gSavedSettings.getControl("VoiceInputAudioDevice")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1)); gSavedSettings.getControl("VoiceOutputAudioDevice")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1)); + gSavedSettings.getControl("LipSyncEnabled")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1)); } |