From c01edec021194bacb86dc9a3f5a3cc655a8cb15f Mon Sep 17 00:00:00 2001 From: Adam Moss Date: Tue, 22 Apr 2008 16:17:22 +0000 Subject: QAR-468 "Babble Lipsync MergeMe" svn merge -c85508 svn+ssh://svn.lindenlab.com/svn/linden/branches/babble-merge1-r85500 --- indra/newview/llviewercontrol.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llviewercontrol.cpp') 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)); } -- cgit v1.3