diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-10-17 19:33:09 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-10-17 19:33:09 -0700 |
| commit | ec9260701feaa9ae1453c57f0f70449bb9b60af2 (patch) | |
| tree | 9a6e74ee503c956dc8f13851f3ff0da712861b08 /indra/newview/llappviewer.cpp | |
| parent | e56145176875a09dc9e1524a47bcc1259582c896 (diff) | |
| parent | 49ad7fd4b57cec635c557070be02556094e90ff6 (diff) | |
Pull merge from richard/viewer-chui
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 6b15e4b21a..d6c781020d 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1893,8 +1893,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; @@ -1963,12 +1972,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()) |