diff options
author | unknown | 2008-12-30 13:44:15 -0700 |
---|---|---|
committer | unknown | 2008-12-30 13:44:15 -0700 |
commit | 48cd01106bb9567353fbe18c44f3c90a78ab8731 (patch) | |
tree | 5cc5089770a91d0f888098963748a1bebbb127c8 /linden/indra/newview/llappviewer.cpp | |
parent | Added fix for VWR-10392 as well as other fixes (diff) | |
parent | Workaround for change volume bug in gstreamen 0.10.21 (diff) | |
download | meta-impy-48cd01106bb9567353fbe18c44f3c90a78ab8731.zip meta-impy-48cd01106bb9567353fbe18c44f3c90a78ab8731.tar.gz meta-impy-48cd01106bb9567353fbe18c44f3c90a78ab8731.tar.bz2 meta-impy-48cd01106bb9567353fbe18c44f3c90a78ab8731.tar.xz |
Merged in balp's openal branch
Diffstat (limited to 'linden/indra/newview/llappviewer.cpp')
-rw-r--r-- | linden/indra/newview/llappviewer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp index 14214b5..2cf418e 100644 --- a/linden/indra/newview/llappviewer.cpp +++ b/linden/indra/newview/llappviewer.cpp | |||
@@ -1179,7 +1179,8 @@ bool LLAppViewer::cleanup() | |||
1179 | 1179 | ||
1180 | llinfos << "Global stuff deleted" << llendflush; | 1180 | llinfos << "Global stuff deleted" << llendflush; |
1181 | 1181 | ||
1182 | #if !LL_RELEASE_FOR_DOWNLOAD | 1182 | #if (!defined(LL_FMOD)) || (!LL_RELEASE_FOR_DOWNLOAD) |
1183 | // OpenAL likes to crash on exit if we *don't* explicitly shut it down. | ||
1183 | if (gAudiop) | 1184 | if (gAudiop) |
1184 | { | 1185 | { |
1185 | gAudiop->shutdown(); | 1186 | gAudiop->shutdown(); |