1 files changed, 27 insertions, 9 deletions

diff --git a/linden/indra/newview/llfloatervoicedevicesettings.cpp b/linden/indra/newview/llfloatervoicedevicesettings.cpp
index 7ffaa73..ad9d776 100644
--- a/linden/indra/newview/llfloatervoicedevicesettings.cpp
+++ b/linden/indra/newview/llfloatervoicedevicesettings.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -85,14 +85,15 @@ BOOL LLPanelVoiceDeviceSettings::postBuild()
 void LLPanelVoiceDeviceSettings::draw()
 {
         // let user know that volume indicator is not yet available
-        childSetVisible("wait_text", !gVoiceClient->inTuningMode());
+        bool is_in_tuning_mode = gVoiceClient->inTuningMode();
+        childSetVisible("wait_text", !is_in_tuning_mode);
 
         LLPanel::draw();
 
         F32 voice_power = gVoiceClient->tuningGetEnergy();
         S32 discrete_power = 0;
 
-        if (!gVoiceClient->inTuningMode())
+        if (!is_in_tuning_mode)
         {
                 discrete_power = 0;
         }
@@ -101,7 +102,7 @@ void LLPanelVoiceDeviceSettings::draw()
                 discrete_power = llmin(4, llfloor((voice_power / LLVoiceClient::OVERDRIVEN_POWER_LEVEL) * 4.f));
         }
         
-        if (gVoiceClient->inTuningMode())
+        if (is_in_tuning_mode)
         {
                 for(S32 power_bar_idx = 0; power_bar_idx < 5; power_bar_idx++)
                 {
@@ -136,7 +137,11 @@ void LLPanelVoiceDeviceSettings::apply()
         }
 
         // assume we are being destroyed by closing our embedding window
-        gSavedSettings.setF32("AudioLevelMic", mMicVolume);
+        LLSlider* volume_slider = getChild<LLSlider>("mic_volume_slider");
+        if(volume_slider)
+        {
+                gSavedSettings.setF32("AudioLevelMic", (F32)volume_slider->getValue().asReal());
+        }
 }
 
 void LLPanelVoiceDeviceSettings::cancel()
@@ -149,6 +154,13 @@ void LLPanelVoiceDeviceSettings::cancel()
 
         if(mCtrlOutputDevices)
                 mCtrlOutputDevices->setSimple(mOutputDevice);
+
+        gSavedSettings.setF32("AudioLevelMic", mMicVolume);
+        LLSlider* volume_slider = getChild<LLSlider>("mic_volume_slider");
+        if(volume_slider)
+        {
+                volume_slider->setValue(mMicVolume);
+        }
 }
 
 void LLPanelVoiceDeviceSettings::refresh()
@@ -156,8 +168,8 @@ void LLPanelVoiceDeviceSettings::refresh()
         //grab current volume
         LLSlider* volume_slider = getChild<LLSlider>("mic_volume_slider");
         // set mic volume tuning slider based on last mic volume setting
-        mMicVolume = (F32)volume_slider->getValue().asReal();
-        gVoiceClient->tuningSetMicVolume(mMicVolume);
+        F32 current_volume = (F32)volume_slider->getValue().asReal();
+        gVoiceClient->tuningSetMicVolume(current_volume);
 
         // Fill in popup menus
         mCtrlInputDevices = getChild<LLComboBox>("voice_input_device");
@@ -247,13 +259,19 @@ void LLPanelVoiceDeviceSettings::onClose(bool app_quitting)
 // static
 void LLPanelVoiceDeviceSettings::onCommitInputDevice(LLUICtrl* ctrl, void* user_data)
 {
-        gSavedSettings.setString("VoiceInputAudioDevice", ctrl->getValue().asString());
+        if(gVoiceClient)
+        {
+                gVoiceClient->setCaptureDevice(ctrl->getValue().asString());
+        }
 }
 
 // static
 void LLPanelVoiceDeviceSettings::onCommitOutputDevice(LLUICtrl* ctrl, void* user_data)
 {
-        gSavedSettings.setString("VoiceOutputAudioDevice", ctrl->getValue().asString());
+        if(gVoiceClient)
+        {
+                gVoiceClient->setRenderDevice(ctrl->getValue().asString());
+        }
 }
 
 //