diff options
| -rw-r--r-- | linden/indra/newview/llstartup.cpp | 3 |
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() | |||
| 1087 | // color init must be after saved settings loaded | 1087 | // color init must be after saved settings loaded |
| 1088 | init_colors(); | 1088 | init_colors(); |
| 1089 | 1089 | ||
| 1090 | if (gSavedSettings.getBOOL("VivoxLicenseAccepted")) | 1090 | if (gSavedSettings.getBOOL("VivoxLicenseAccepted") || gHippoGridManager->getConnectedGrid()->isSecondLife()) |
| 1091 | { | 1091 | { |
| 1092 | // skipping over STATE_LOGIN_VOICE_LICENSE since we don't need it | 1092 | // skipping over STATE_LOGIN_VOICE_LICENSE since we don't need it |
| 1093 | // skipping over STATE_UPDATE_CHECK because that just waits for input | 1093 | // skipping over STATE_UPDATE_CHECK because that just waits for input |
| 1094 | // We don't do this on non-SL grids either | ||
| 1094 | LLStartUp::setStartupState( STATE_LOGIN_AUTH_INIT ); | 1095 | LLStartUp::setStartupState( STATE_LOGIN_AUTH_INIT ); |
| 1095 | } | 1096 | } |
| 1096 | else | 1097 | else |