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/llstartup.cpp | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

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

diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 08e12ce..922de18 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -1161,19 +1161,24 @@ bool idle_startup()
 		// color init must be after saved settings loaded
 		init_colors();
 
-		if (!gSavedSettings.getBOOL("EnableVoiceChat") ||
-			(gSavedSettings.getBOOL("EnableVoiceChat") && gSavedSettings.getBOOL("VivoxLicenseAccepted")) || 
-			!gHippoGridManager->getConnectedGrid()->isSecondLife())
+		// skipping over STATE_LOGIN_VOICE_LICENSE since we don't need it
+		// skipping over STATE_UPDATE_CHECK because that just waits for input
+		// We don't do this on non-SL grids either
+		if (LLVoiceClient::needsVivoxLicense())
 		{
-			// skipping over STATE_LOGIN_VOICE_LICENSE since we don't need it
-			// skipping over STATE_UPDATE_CHECK because that just waits for input
-			// We don't do this on non-SL grids either
-			LLStartUp::setStartupState( STATE_LOGIN_AUTH_INIT );
+			if (gSavedSettings.getBOOL("EnableVoiceChat"))
+			{
+				LLStartUp::setStartupState(STATE_LOGIN_VOICE_LICENSE);
+				LLFirstUse::voiceLicenseAgreement();
+			}
+			else
+			{
+				LLStartUp::setStartupState(STATE_LOGIN_AUTH_INIT);
+			}
 		}
 		else
 		{
-			LLStartUp::setStartupState(STATE_LOGIN_VOICE_LICENSE);
-			LLFirstUse::voiceLicenseAgreement();
+			LLStartUp::setStartupState(STATE_LOGIN_AUTH_INIT);
 		}
 
 		return FALSE;
-- 
cgit v1.1