From 5516d33425bcd0833ad9384b6ab4d18d8a72da3a Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Tue, 14 Mar 2017 14:17:00 -0400
Subject: remove use of cached controls for enable and override of voice

---
 indra/newview/llvoicevivox.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index 0b93d34b49..b13f9a22aa 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -4965,9 +4965,7 @@ void LLVivoxVoiceClient::setVoiceEnabled(bool enabled)
 
 bool LLVivoxVoiceClient::voiceEnabled()
 {
-    static LLUICachedControl<bool> enable_voice("EnableVoiceChat", true);
-    static LLUICachedControl<bool> override_disable_voice("CmdLineDisableVoice", false);
-    return enable_voice && ! override_disable_voice;
+	return gSavedSettings.getBOOL("EnableVoiceChat") && !gSavedSettings.getBOOL("CmdLineDisableVoice");
 }
 
 void LLVivoxVoiceClient::setLipSyncEnabled(BOOL enabled)
-- 
cgit v1.2.3