summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
authorcallum_linden <none@none>2013-02-01 08:44:52 -0800
committercallum_linden <none@none>2013-02-01 08:44:52 -0800
commitb0f2f02333a87598299b490a1e42eb42a8125f74 (patch)
tree8d1fe612b4ca516a3b8c97caa73efa1f9e836275 /indra/newview/llappviewer.cpp
parent9b86b8bf3d822bbeefb8518fb335e81a6dc7f3b3 (diff)
Removed (most) references to older FMOD library - still a little Linux clean up left
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r--indra/newview/llappviewer.cpp14
1 files changed, 1 insertions, 13 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 1000c0e1e8..55d7a5d45d 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1677,19 +1677,7 @@ bool LLAppViewer::cleanup()
gAudiop->setStreamingAudioImpl(NULL);
// shut down the audio subsystem
-
- bool want_longname = false;
- if (gAudiop->getDriverName(want_longname) == "FMOD")
- {
- // This hack exists because fmod likes to occasionally
- // crash or hang forever when shutting down, for no
- // apparent reason.
- llwarns << "Hack, skipping FMOD audio engine cleanup" << llendflush;
- }
- else
- {
- gAudiop->shutdown();
- }
+ gAudiop->shutdown();
delete gAudiop;
gAudiop = NULL;