diff options
| author | Callum Prentice <callum@lindenlab.com> | 2014-05-28 09:06:58 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2014-05-28 09:06:58 -0700 |
| commit | 038f250caea80e21192372019dca8fdcf269c0d9 (patch) | |
| tree | 2d5d0ec8fcc86886c27ffc58166183ce5f96be58 /indra/newview/llstartup.cpp | |
| parent | fbe10b8ee0537c71f2119142f4e0da1bd69d1a53 (diff) | |
| parent | 644ca6a0f8a7759119814f88df93b8e838321a12 (diff) | |
Merge with head of viewer-release
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rwxr-xr-x | indra/newview/llstartup.cpp | 35 |
1 files changed, 16 insertions, 19 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index e37c9f47ee..1fe8780bd5 100755 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -622,30 +622,27 @@ bool idle_startup() if (FALSE == gSavedSettings.getBOOL("NoAudio")) { + delete gAudiop; gAudiop = NULL; #ifdef LL_FMODEX - if (!gAudiop #if !LL_WINDOWS - && NULL == getenv("LL_BAD_FMODEX_DRIVER") + if (NULL == getenv("LL_BAD_FMODEX_DRIVER")) #endif // !LL_WINDOWS - ) { gAudiop = (LLAudioEngine *) new LLAudioEngine_FMODEX(gSavedSettings.getBOOL("FMODExProfilerEnable")); } #endif #ifdef LL_OPENAL - if (!gAudiop #if !LL_WINDOWS - && NULL == getenv("LL_BAD_OPENAL_DRIVER") + if (NULL == getenv("LL_BAD_OPENAL_DRIVER")) #endif // !LL_WINDOWS - ) { gAudiop = (LLAudioEngine *) new LLAudioEngine_OpenAL(); } #endif - + if (gAudiop) { #if LL_WINDOWS @@ -2077,24 +2074,24 @@ bool idle_startup() { // wait for avatar to be completely loaded //LL_INFOS() << "avatar fully loaded" << LL_ENDL; - LLStartUp::setStartupState( STATE_CLEANUP ); + LLStartUp::setStartupState( STATE_CLEANUP ); } - // OK to just get the wearables + // OK to just get the wearables else if (!gAgent.isFirstLogin() && gAgentWearables.areWearablesLoaded() ) - { - // We have our clothing, proceed. + { + // We have our clothing, proceed. //LL_INFOS() << "wearables loaded" << LL_ENDL; - LLStartUp::setStartupState( STATE_CLEANUP ); - } + LLStartUp::setStartupState( STATE_CLEANUP ); + } else { - display_startup(); - update_texture_fetch(); - display_startup(); + display_startup(); + update_texture_fetch(); + display_startup(); set_startup_status(0.9f + 0.1f * wearables_time / max_wearables_time(), - LLTrans::getString("LoginDownloadingClothing").c_str(), - gAgent.mMOTD.c_str()); - display_startup(); + LLTrans::getString("LoginDownloadingClothing").c_str(), + gAgent.mMOTD.c_str()); + display_startup(); } //fall through this frame to STATE_CLEANUP } |