diff options
| author | Adam Moss <moss@lindenlab.com> | 2008-12-10 17:38:17 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2008-12-10 17:38:17 +0000 |
| commit | 9c0dbb123376608e464fcd8d1a2e288e01d78a3f (patch) | |
| tree | c0184a072bdf768213afa3d749e575ea10c35851 /indra | |
| parent | 14a5879c88497c05db452e52bc5ebe876368194f (diff) | |
always skip fmod shutdown, instead of just for release builds.
fmod shutdown has been a source of mystery crashes forEVER (go mine
svn!). I don't know why they'd be more aggressive now. butttt...
materially different code behaviour depending on build type sucks as a
policy anyway, so always skip fmod shutdown.
straight-to-trunk to unblock(?) featurettes landing.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 5699ac42e2..ac399b45df 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1168,17 +1168,15 @@ bool LLAppViewer::cleanup() if (gAudiop) { -#if LL_RELEASE_FOR_DOWNLOAD bool want_longname = false; if (gAudiop->getDriverName(want_longname) == "FMOD") { // This hack exists because fmod likes to occasionally - // hang forever when shutting down, for no apparent - // reason. + // crash or hang forever when shutting down, for no + // apparent reason. llwarns << "Hack, skipping FMOD audio engine cleanup" << llendflush; } else -#endif // LL_RELEASE_FOR_DOWNLOAD { gAudiop->shutdown(); } |