Merge branch 'next' of git://github.com/imprudence/imprudence into next

Removed the new "Set your own Imprudence tag colour feature".  Should check though, might be bits left that where not obvious.

Conflicts:
	.gitignore
	linden/indra/cmake/00-Common.cmake
	linden/indra/newview/llvoavatar.cpp
	linden/indra/newview/res/viewerRes.rc
	linden/indra/newview/skins/default/xui/en-us/panel_login.xml
	linden/indra/newview/viewer_manifest.py
	linden/indra/newview/viewerinfo.cpp

The usual branding conflicts.

1 files changed, 14 insertions, 9 deletions

diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index dcaa249..bbb942f 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -1168,19 +1168,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;