diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-10-10 21:40:10 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-10-10 21:40:10 -0400 |
| commit | 1709952adbb3ad3ba4eb7d5be39c0c67c389c7c5 (patch) | |
| tree | ad71b6021639d4d9d89c9992aff13f000dd0248f /indra/newview/llappviewer.cpp | |
| parent | cb5a0a5686799ec834f16a0bc273d24f62140753 (diff) | |
| parent | 3f45fa719e4c72e528801d4d8330a114e5458f30 (diff) | |
pull back 3.4.1-beta6 fixes
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index c9458857d1..0a9d6229ef 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1891,8 +1891,17 @@ bool LLAppViewer::cleanup() sTextureFetch->shutDownTextureCacheThread() ; sTextureFetch->shutDownImageDecodeThread() ; + llinfos << "Shutting down message system" << llendflush; + end_messaging_system(); + + // *NOTE:Mani - The following call is not thread safe. + LL_CHECK_MEMORY + LLCurl::cleanupClass(); + LL_CHECK_MEMORY + LLFilePickerThread::cleanupClass(); + //MUST happen AFTER LLCurl::cleanupClass delete sTextureCache; sTextureCache = NULL; delete sTextureFetch; @@ -1961,12 +1970,6 @@ bool LLAppViewer::cleanup() LLViewerAssetStatsFF::cleanup(); - llinfos << "Shutting down message system" << llendflush; - end_messaging_system(); - - // *NOTE:Mani - The following call is not thread safe. - LLCurl::cleanupClass(); - // If we're exiting to launch an URL, do that here so the screen // is at the right resolution before we launch IE. if (!gLaunchFileOnQuit.empty()) |