diff options
| author | simon <none@none> | 2014-03-26 10:04:53 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-03-26 10:04:53 -0700 |
| commit | 33dfc0a8a1ed56d7d24611981736fd5baf6b03c2 (patch) | |
| tree | 5dfdbcede0d8c689e796cf65ebc21bb149c17b8e /indra/newview/llstartup.cpp | |
| parent | 00a325ccb90b1c6800ec78e1211b5097d9c27a58 (diff) | |
| parent | 5c20e06dbd0845e2d45daae610c43fc89e24028f (diff) | |
Pull in downstream -bear, viewer-release and become version 3.7.5
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rwxr-xr-x | indra/newview/llstartup.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index a5fdb72f9b..2f658e066f 100755 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -624,25 +624,22 @@ 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(); } @@ -2687,7 +2684,7 @@ void init_start_screen(S32 location_id) } } - if(gStartTexture.isNull()) + if(gStartTexture && gStartTexture.isNull()) { gStartTexture = LLViewerTexture::sBlackImagep ; gStartImageWidth = gStartTexture->getWidth() ; |