diff options
| author | Anchor Linden <anchor@lindenlab.com> | 2018-05-21 16:47:42 -0700 |
|---|---|---|
| committer | Anchor Linden <anchor@lindenlab.com> | 2018-05-21 16:47:42 -0700 |
| commit | 0fdbe7e34df55ac92302b4af38c42d03454d3bc1 (patch) | |
| tree | 038c6087299c9096ac7c6606ec45a8339eb0fd72 /indra/llvfs/lllfsthread.cpp | |
| parent | 3bf89821d9c9777a0f24d89280bd7a7011a7a3df (diff) | |
| parent | c70119ebabc4b06e2b0db02aea8c56e01fbc666e (diff) | |
Merge
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 } |