From 9c0dbb123376608e464fcd8d1a2e288e01d78a3f Mon Sep 17 00:00:00 2001
From: Adam Moss <moss@lindenlab.com>
Date: Wed, 10 Dec 2008 17:38:17 +0000
Subject: [PATCH] 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.
---
indra/newview/llappviewer.cpp | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 5699ac42e26..ac399b45df3 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();
}
--
GitLab