From c7b0dc6733e937f8457bf50041e4ff682abb6eb4 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 17 Oct 2011 21:12:22 -0700
Subject: Fixed vivox license appearing when enabling voice on opensim

---
 linden/indra/newview/llprefsvoice.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'linden/indra/newview/llprefsvoice.cpp')

diff --git a/linden/indra/newview/llprefsvoice.cpp b/linden/indra/newview/llprefsvoice.cpp
index 0e8e816..cb52ee0 100644
--- a/linden/indra/newview/llprefsvoice.cpp
+++ b/linden/indra/newview/llprefsvoice.cpp
@@ -42,6 +42,7 @@
 #include "llkeyboard.h"
 #include "llmodaldialog.h"
 #include "llviewercontrol.h"
+#include "llvoiceclient.h"
 #include "lluictrlfactory.h"
 
 
@@ -150,7 +151,7 @@ void LLPrefsVoice::apply()
 	}
 
 	bool enable_voice = childGetValue("enable_voice_check");
-	if (enable_voice && !gSavedSettings.getBOOL("VivoxLicenseAccepted"))
+	if (enable_voice && LLVoiceClient::needsVivoxLicense())
 	{
 		// This window enables voice chat if license is accepted
 		FloaterVoiceLicense::getInstance()->open();
-- 
cgit v1.1