From 74175a06d08c736f7fbd44a1eab2a94989215772 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 19 Apr 2011 14:49:18 -0700
Subject: Fixed vivox license appearing on other grids rather than specifically
 on second life login when voice is enabled.

(Partial cherry pick from commit a0902a050cc713f742990a09d2a610d4c135b7c7)
---
 linden/indra/newview/llstartup.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index ab3a721..2104d9b 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -1087,7 +1087,9 @@ bool idle_startup()
 		// color init must be after saved settings loaded
 		init_colors();
 
-		if (gSavedSettings.getBOOL("VivoxLicenseAccepted") || gHippoGridManager->getConnectedGrid()->isSecondLife())
+		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
-- 
cgit v1.1