aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewercontrol.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llviewercontrol.cpp')
-rw-r--r--linden/indra/newview/llviewercontrol.cpp17
1 files changed, 1 insertions, 16 deletions
diff --git a/linden/indra/newview/llviewercontrol.cpp b/linden/indra/newview/llviewercontrol.cpp
index 9651fa3..7a30b22 100644
--- a/linden/indra/newview/llviewercontrol.cpp
+++ b/linden/indra/newview/llviewercontrol.cpp
@@ -424,22 +424,7 @@ bool handleVoiceClientPrefsChanged(const LLSD& newvalue)
424{ 424{
425 if(gVoiceClient) 425 if(gVoiceClient)
426 { 426 {
427 // Note: Ignore the specific event value, look up the ones we want 427 gVoiceClient->updateSettings();
428
429 gVoiceClient->setVoiceEnabled(gSavedSettings.getBOOL("EnableVoiceChat"));
430 gVoiceClient->setUsePTT(gSavedSettings.getBOOL("PTTCurrentlyEnabled"));
431 std::string keyString = gSavedSettings.getString("PushToTalkButton");
432 gVoiceClient->setPTTKey(keyString);
433 gVoiceClient->setPTTIsToggle(gSavedSettings.getBOOL("PushToTalkToggle"));
434 gVoiceClient->setEarLocation(gSavedSettings.getS32("VoiceEarLocation"));
435 std::string serverName = gSavedSettings.getString("VivoxDebugServerName");
436 gVoiceClient->setVivoxDebugServerName(serverName);
437
438 std::string inputDevice = gSavedSettings.getString("VoiceInputAudioDevice");
439 gVoiceClient->setCaptureDevice(inputDevice);
440 std::string outputDevice = gSavedSettings.getString("VoiceOutputAudioDevice");
441 gVoiceClient->setRenderDevice(outputDevice);
442 gVoiceClient->setLipSyncEnabled(gSavedSettings.getBOOL("LipSyncEnabled"));
443 } 428 }
444 return true; 429 return true;
445} 430}