From 9e43710ca3fd9352581355d92f27a3952090f8af Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Sun, 20 Mar 2011 01:37:07 +0100
Subject: fix: voice always on, even if told not to be

introduced by 56bf45f  >_>

(cherry picked from commit 8f92d7925f2ba9259a6597c80584b09e023902da)
---
 linden/indra/newview/llvoiceclient.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/linden/indra/newview/llvoiceclient.cpp b/linden/indra/newview/llvoiceclient.cpp
index a6cec7b..dadc4e6 100644
--- a/linden/indra/newview/llvoiceclient.cpp
+++ b/linden/indra/newview/llvoiceclient.cpp
@@ -1529,7 +1529,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)
 	{
-- 
cgit v1.1