diff options
Diffstat (limited to 'linden/indra/newview/llprefsvoice.cpp')
-rw-r--r-- | linden/indra/newview/llprefsvoice.cpp | 11 |
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() | |||
139 | gSavedSettings.setBOOL("VoiceCallsFriendsOnly", childGetValue("voice_call_friends_only_check")); | 139 | gSavedSettings.setBOOL("VoiceCallsFriendsOnly", childGetValue("voice_call_friends_only_check")); |
140 | gSavedSettings.setBOOL("PushToTalkToggle", childGetValue("push_to_talk_toggle_check")); | 140 | gSavedSettings.setBOOL("PushToTalkToggle", childGetValue("push_to_talk_toggle_check")); |
141 | gSavedSettings.setS32("VoiceEarLocation", childGetValue("ear_location")); | 141 | gSavedSettings.setS32("VoiceEarLocation", childGetValue("ear_location")); |
142 | |||
143 | LLFloaterVoiceDeviceSettings* voice_device_settings = LLFloaterVoiceDeviceSettings::getInstance(); | ||
144 | if(voice_device_settings) | ||
145 | { | ||
146 | voice_device_settings->apply(); | ||
147 | } | ||
142 | } | 148 | } |
143 | 149 | ||
144 | void LLPrefsVoice::cancel() | 150 | void LLPrefsVoice::cancel() |
145 | { | 151 | { |
152 | LLFloaterVoiceDeviceSettings* voice_device_settings = LLFloaterVoiceDeviceSettings::getInstance(); | ||
153 | if(voice_device_settings) | ||
154 | { | ||
155 | voice_device_settings->cancel(); | ||
156 | } | ||
146 | } | 157 | } |
147 | 158 | ||
148 | void LLPrefsVoice::setKey(KEY key) | 159 | void LLPrefsVoice::setKey(KEY key) |