1 files changed, 3 insertions, 1 deletions

diff --git a/linden/indra/newview/llvoiceclient.cpp b/linden/indra/newview/llvoiceclient.cpp
index c05f685..2266aab 100644
--- a/linden/indra/newview/llvoiceclient.cpp
+++ b/linden/indra/newview/llvoiceclient.cpp
@@ -1539,7 +1539,9 @@ void LLVoiceClient::stateMachine()
 {
 
         // Disable voice as long as the viewer is disconnected from the sim (login/relog)
-        setVoiceEnabled(!gDisconnected);
+        setVoiceEnabled(!gDisconnected
+                        && gSavedSettings.getBOOL("EnableVoiceChat")
+                        && !gSavedSettings.getBOOL("CmdLineDisableVoice") );
 
         if(mVoiceEnabled)
         {