diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2022-06-09 13:03:58 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2022-06-09 13:03:58 -0400 |
| commit | a65e039174b0e7abb2a7b03b88d879092e8dd0ca (patch) | |
| tree | aa4c8646e0d43019cfa5cbbe63c44153200e2925 /indra/newview/llappviewer.cpp | |
| parent | 50dca86f64a167fe0db901310d04784b2f0dfa1f (diff) | |
| parent | da069765b1974e60df5ebf9e973c7fd00c52e329 (diff) | |
SL-17483: Merge branch 'DRTVWR-563' of viewer into sl-17483
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index ae0c9d4dd6..55c0b31bf6 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1847,8 +1847,6 @@ bool LLAppViewer::cleanup() LL_INFOS() << "Cache files removed" << LL_ENDL; - // Wait for any pending LFS IO - flushLFSIO(); LL_INFOS() << "Shutting down Views" << LL_ENDL; // Destroy the UI @@ -2055,6 +2053,7 @@ bool LLAppViewer::cleanup() sTextureFetch->shutDownTextureCacheThread() ; sTextureFetch->shutDownImageDecodeThread() ; + LLLFSThread::sLocal->shutdown(); LL_INFOS() << "Shutting down message system" << LL_ENDL; end_messaging_system(); |