summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2022-06-07 17:27:29 -0500
committerDave Parks <davep@lindenlab.com>2022-06-07 17:27:29 -0500
commit039c6689c9f3e10970d2617a1127c6a48891e619 (patch)
tree755ecb1303913f1a4fb0a12382a4b63507ac5fbf /indra
parent99189ff2d5e96434cdc58115bbc03614f8e50773 (diff)
SL-17547 Fix for crash on shutdown cleaning up LLLFSThread
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llappviewer.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index d7ed2bb4df..0b80d32ac3 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1850,8 +1850,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
@@ -2058,6 +2056,7 @@ bool LLAppViewer::cleanup()
sTextureFetch->shutDownTextureCacheThread() ;
sTextureFetch->shutDownImageDecodeThread() ;
+ LLLFSThread::sLocal->shutdown();
LL_INFOS() << "Shutting down message system" << LL_ENDL;
end_messaging_system();