diff options
| author | Jacek Antonelli | 2009-01-13 00:19:34 -0600 |
|---|---|---|
| committer | Jacek Antonelli | 2009-01-13 00:19:34 -0600 |
| commit | 106b2a600c59404ef6bb95b77f8bbf271b659baa (patch) | |
| tree | 4f9394f0ca34003347de3dffff40efd8a3a43c6c /linden/indra/newview/llappviewer.cpp | |
| parent | Merge 1.1.0 alpha into quickfilter (diff) | |
| parent | Merge commit 'mccabe/1.1.0a-gstreamer' into 1.1.0a (diff) | |
| download | meta-impy-106b2a600c59404ef6bb95b77f8bbf271b659baa.zip meta-impy-106b2a600c59404ef6bb95b77f8bbf271b659baa.tar.gz meta-impy-106b2a600c59404ef6bb95b77f8bbf271b659baa.tar.bz2 meta-impy-106b2a600c59404ef6bb95b77f8bbf271b659baa.tar.xz | |
Merge branch '1.1.0a-gstreamer' into next
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(); |