From ff52ac089f9ed67410f80fe66d0b997f0f2dafcc Mon Sep 17 00:00:00 2001
From: Roxanne Skelly <roxie@lindenlab.com>
Date: Wed, 15 Jul 2009 21:50:42 +0000
Subject: DEV-34822 viewer 1.23 merge DEV-32649 Merge the diamondware/vivox
 voice code -r124876 -r125220

---
 indra/newview/llviewercontrol.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/llviewercontrol.cpp')

diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index 57434bd1e4..7be45c649c 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -441,9 +441,9 @@ bool handleHighResSnapshotChanged(const LLSD& newvalue)
 
 bool handleVoiceClientPrefsChanged(const LLSD& newvalue)
 {
-	if(gVoiceClient)
+	if(LLVoiceClient::getInstance())
 	{
-		gVoiceClient->updateSettings();
+		LLVoiceClient::getInstance()->updateSettings();
 	}
 	return true;
 }
-- 
cgit v1.2.3