Fixed the Vivox license prompt appearing when connecting to non-SL grids on startup

(cherry picked from commit cea604cda04d783b989498055102674170864b5c)

1 files changed, 2 insertions, 1 deletions

diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 77a2694..ab3a721 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -1087,10 +1087,11 @@ bool idle_startup()
                 // color init must be after saved settings loaded
                 init_colors();
 
-                if (gSavedSettings.getBOOL("VivoxLicenseAccepted"))
+                if (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
                         LLStartUp::setStartupState( STATE_LOGIN_AUTH_INIT );
                 }
                 else