diff options
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rwxr-xr-x | indra/newview/llstartup.cpp | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 56fac3b092..03d13018f6 100755 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -1891,19 +1891,6 @@ bool idle_startup() display_startup(); - // based on the comments, we've successfully logged in so we can delete the 'forced' - // URL that the updater set in settings.ini (in a mostly paranoid fashion) - std::string nextLoginLocation = gSavedSettings.getString( "NextLoginLocation" ); - if ( nextLoginLocation.length() ) - { - // clear it - gSavedSettings.setString( "NextLoginLocation", "" ); - - // and make sure it's saved - gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile") , TRUE ); - LLUIColorTable::instance().saveUserSettings(); - }; - display_startup(); // JC: Initializing audio requests many sounds for download. init_audio(); @@ -2035,7 +2022,7 @@ bool idle_startup() { display_startup(); F32 timeout_frac = timeout.getElapsedTimeF32()/PRECACHING_DELAY; - + // We now have an inventory skeleton, so if this is a user's first // login, we can start setting up their clothing and avatar // appearance. This helps to avoid the generic "Ruth" avatar in @@ -2129,20 +2116,20 @@ bool idle_startup() && gAgentAvatarp->isFullyLoaded()) { LL_DEBUGS("Avatar") << "avatar fully loaded" << LL_ENDL; - LLStartUp::setStartupState( STATE_CLEANUP ); + LLStartUp::setStartupState( STATE_CLEANUP ); return TRUE; } } else { - // OK to just get the wearables + // OK to just get the wearables if ( gAgentWearables.areWearablesLoaded() ) - { - // We have our clothing, proceed. + { + // We have our clothing, proceed. LL_DEBUGS("Avatar") << "wearables loaded" << LL_ENDL; - LLStartUp::setStartupState( STATE_CLEANUP ); + LLStartUp::setStartupState( STATE_CLEANUP ); return TRUE; - } + } } //fall through this frame to STATE_CLEANUP } |