diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-10-04 20:12:51 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-10-04 20:12:51 -0400 |
| commit | 07899b2820599600fac889355c1742c81d69d051 (patch) | |
| tree | d6166632b77cf4428cbfbf0016c15a85ff87e515 /indra/newview/llappviewer.cpp | |
| parent | 7fe8e87d19f4940d9b682faa7e189d1b1ac18785 (diff) | |
| parent | a5e28651f539ff0f9bb9a678538d70b5fa9f97ba (diff) | |
merge changes for DRTVWR-222
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index e8934d9a9e..2b6d6d15fa 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1888,8 +1888,6 @@ bool LLAppViewer::cleanup() delete sTextureCache; sTextureCache = NULL; - delete sTextureFetch; - sTextureFetch = NULL; delete sImageDecodeThread; sImageDecodeThread = NULL; delete mFastTimerLogThread; @@ -1958,8 +1956,14 @@ bool LLAppViewer::cleanup() end_messaging_system(); // *NOTE:Mani - The following call is not thread safe. + LL_CHECK_MEMORY LLCurl::cleanupClass(); + LL_CHECK_MEMORY + //MUST happen AFTER LLCurl::cleanupClass + delete sTextureFetch; + sTextureFetch = NULL; + // 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()) |