diff options
| author | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-05-22 21:28:07 +0100 |
|---|---|---|
| committer | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-05-22 21:28:07 +0100 |
| commit | 689beff6698fcb8582c44f58bb9896606850b149 (patch) | |
| tree | 7f567399e152057c1fe80a863ef660b5850bb324 /indra/llvfs/lllfsthread.cpp | |
| parent | 313dbc7fea54cc58ceb8bd3437b91674360a3384 (diff) | |
| parent | 3888de9439c20eb1698e16fb878a47d78cfdf85e (diff) | |
Merge 5.1.5
Diffstat (limited to 'indra/llvfs/lllfsthread.cpp')
| -rw-r--r-- | indra/llvfs/lllfsthread.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llvfs/lllfsthread.cpp b/indra/llvfs/lllfsthread.cpp index 2fd2614cce..be8e83a56f 100644 --- a/indra/llvfs/lllfsthread.cpp +++ b/indra/llvfs/lllfsthread.cpp @@ -52,13 +52,14 @@ S32 LLLFSThread::updateClass(U32 ms_elapsed) //static void LLLFSThread::cleanupClass() { + llassert(sLocal != NULL); sLocal->setQuitting(); while (sLocal->getPending()) { sLocal->update(0); } delete sLocal; - sLocal = 0; + sLocal = NULL; } //---------------------------------------------------------------------------- @@ -75,6 +76,7 @@ LLLFSThread::LLLFSThread(bool threaded) : LLLFSThread::~LLLFSThread() { + // mLocalAPRFilePoolp cleanup in LLThread // ~LLQueuedThread() will be called here } |