4 files changed, 32 insertions, 2 deletions

diff --git a/linden/indra/newview/llprefsvoice.cpp b/linden/indra/newview/llprefsvoice.cpp
index c2f42ff..167e079 100644
--- a/linden/indra/newview/llprefsvoice.cpp
+++ b/linden/indra/newview/llprefsvoice.cpp
@@ -111,6 +111,7 @@ LLPrefsVoice::~LLPrefsVoice()
 BOOL LLPrefsVoice::postBuild()
 {
         childSetCommitCallback("enable_voice_check", onCommitEnableVoiceChat, this);
+        childSetAction("reset_voice", onClickResetVoice, this);
         childSetAction("set_voice_hotkey_button", onClickSetKey, this);
         childSetAction("set_voice_middlemouse_button", onClickSetMiddleMouse, this);
         childSetAction("device_settings_btn", onClickVoiceDeviceSettings, NULL);
@@ -192,6 +193,31 @@ void LLPrefsVoice::onClickSetKey(void* user_data)
         dialog->startModal();
 }
 
+
+void LLPrefsVoice::onClickResetVoice(void* user_data)
+{
+        // *TODO: Change this to make voice really reset
+        BOOL voice_disabled = gSavedSettings.getBOOL("CmdLineDisableVoice");
+        bool enable = !voice_disabled && gSavedSettings.getBOOL("EnableVoiceChat");
+        if(enable)
+        {
+                //Seems to make voice at least reconnect to the current channel.
+                //Was hopeing it would have actualy restarted voice. --Liny
+                gSavedSettings.setBOOL("EnableVoiceChat", FALSE);
+                LLFloaterVoiceDeviceSettings* voice_device_settings = LLFloaterVoiceDeviceSettings::getInstance();
+                if(voice_device_settings)
+                {
+                        voice_device_settings->apply();
+                }
+                gSavedSettings.setBOOL("EnableVoiceChat", TRUE);
+                voice_device_settings = LLFloaterVoiceDeviceSettings::getInstance();
+                if(voice_device_settings)
+                {
+                        voice_device_settings->apply();
+                }
+        }
+}
+
 //static
 void LLPrefsVoice::onClickSetMiddleMouse(void* user_data)
 {
diff --git a/linden/indra/newview/llprefsvoice.h b/linden/indra/newview/llprefsvoice.h
index 49f6035..af298c5 100644
--- a/linden/indra/newview/llprefsvoice.h
+++ b/linden/indra/newview/llprefsvoice.h
@@ -50,6 +50,7 @@ public:
 
 private:
         static void onCommitEnableVoiceChat(LLUICtrl* ctrl, void* user_data);
+        static void onClickResetVoice(void* user_data);
         static void onClickSetKey(void* user_data);
         static void onClickSetMiddleMouse(void* user_data);
         static void onClickVoiceDeviceSettings(void* user_data);
diff --git a/linden/indra/newview/llvoiceclient.cpp b/linden/indra/newview/llvoiceclient.cpp
index 908bedb..660b60a 100644
--- a/linden/indra/newview/llvoiceclient.cpp
+++ b/linden/indra/newview/llvoiceclient.cpp
@@ -1215,7 +1215,7 @@ void LLVoiceClient::terminate()
 
 void LLVoiceClient::updateSettings()
 {
-        setVoiceEnabled(gSavedSettings.getBOOL("EnableVoiceChat"));
+        setVoiceEnabled(gSavedSettings.getBOOL("EnableVoiceChat") && !gSavedSettings.getBOOL("CmdLineDisableVoice"));
         setUsePTT(gSavedSettings.getBOOL("PTTCurrentlyEnabled"));
         std::string keyString = gSavedSettings.getString("PushToTalkButton");
         setPTTKey(keyString);
@@ -5821,7 +5821,7 @@ void LLVoiceClient::setVoiceEnabled(bool enabled)
 
 bool LLVoiceClient::voiceEnabled()
 {
-        return gSavedSettings.getBOOL("EnableVoiceChat") && !gSavedSettings.getBOOL("CmdLineDisableVoice");
+        return LLVoiceClient::getInstance()->mVoiceEnabled;//gSavedSettings.getBOOL("EnableVoiceChat") && !gSavedSettings.getBOOL("CmdLineDisableVoice");
 }
 
 void LLVoiceClient::setLipSyncEnabled(BOOL enabled)
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
index 8712be5..8e6fc0d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
@@ -76,6 +76,9 @@
         <button bottom_delta="-40" follows="left|top" font="SansSerif" height="20"
              label="Device Settings" left="28" mouse_opaque="true"
              name="device_settings_btn" width="155" />
+        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center" height="20"
+                label="Reset Voice" left_delta="160" mouse_opaque="true"
+                name="reset_voice" width="115" />
         <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-32"
              embedded_items="false" enabled="false" follows="left|top"
              font="SansSerifSmall" height="35" hide_border="true" hide_scrollbar="true"