diff options
| author | Howard Stearns <howard.stearns@gmail.com> | 2022-09-01 13:38:59 -0700 |
|---|---|---|
| committer | Howard Stearns <howard.stearns@gmail.com> | 2022-09-01 13:38:59 -0700 |
| commit | 3cf349c4fa1c1879babab23536baff8e4e5421fc (patch) | |
| tree | 61e6af4eb66a3ed754f14743bd08ece4dcdf6a30 /indra/newview/llappviewer.cpp | |
| parent | 01d03edd8512580575da515401a42021577c3c57 (diff) | |
| parent | d2d257cfa99b685160e16ed93c163018e9fe3c50 (diff) | |
Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into SL-17967
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 81387ec8b5..a2329d46b7 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2068,8 +2068,12 @@ bool LLAppViewer::cleanup() //MUST happen AFTER SUBSYSTEM_CLEANUP(LLCurl) delete sTextureCache; sTextureCache = NULL; - delete sTextureFetch; - sTextureFetch = NULL; + if (sTextureFetch) + { + sTextureFetch->shutdown(); + delete sTextureFetch; + sTextureFetch = NULL; + } delete sImageDecodeThread; sImageDecodeThread = NULL; delete mFastTimerLogThread; |