Second Life viewer sources 1.22.6-RC

1 files changed, 11 insertions, 0 deletions

diff --git a/linden/indra/newview/llprefsvoice.cpp b/linden/indra/newview/llprefsvoice.cpp
index 568e1be..ae7c921 100644
--- a/linden/indra/newview/llprefsvoice.cpp
+++ b/linden/indra/newview/llprefsvoice.cpp
@@ -139,10 +139,21 @@ void LLPrefsVoice::apply()
         gSavedSettings.setBOOL("VoiceCallsFriendsOnly", childGetValue("voice_call_friends_only_check"));
         gSavedSettings.setBOOL("PushToTalkToggle", childGetValue("push_to_talk_toggle_check"));
         gSavedSettings.setS32("VoiceEarLocation", childGetValue("ear_location"));
+        
+        LLFloaterVoiceDeviceSettings* voice_device_settings = LLFloaterVoiceDeviceSettings::getInstance();
+        if(voice_device_settings)
+        {
+                voice_device_settings->apply();
+        }
 }
 
 void LLPrefsVoice::cancel()
 {
+        LLFloaterVoiceDeviceSettings* voice_device_settings = LLFloaterVoiceDeviceSettings::getInstance();
+        if(voice_device_settings)
+        {
+                voice_device_settings->cancel();
+        }
 }
 
 void LLPrefsVoice::setKey(KEY key)