summaryrefslogtreecommitdiff
path: root/indra/llfilesystem
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2022-05-31 16:54:05 -0500
committerDave Parks <davep@lindenlab.com>2022-05-31 16:54:05 -0500
commitfc7b5549cb6092194d11b8d87600f21992305c1c (patch)
tree40ef1776b4abd77405c60d64043f5782dfc3e4be /indra/llfilesystem
parentdfa71e2bb59e81de93f626fada6975ae46b01bb6 (diff)
SL-17484 Fix for unit tests. Deprecate non-threaded LLQueuedThread and make lllfsthread threaded.
Diffstat (limited to 'indra/llfilesystem')
-rw-r--r--indra/llfilesystem/lllfsthread.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llfilesystem/lllfsthread.cpp b/indra/llfilesystem/lllfsthread.cpp
index 944e981ecf..dbb69cd605 100644
--- a/indra/llfilesystem/lllfsthread.cpp
+++ b/indra/llfilesystem/lllfsthread.cpp
@@ -45,8 +45,7 @@ void LLLFSThread::initClass(bool local_is_threaded)
//static
S32 LLLFSThread::updateClass(U32 ms_elapsed)
{
- sLocal->update((F32)ms_elapsed);
- return sLocal->getPending();
+ return sLocal->update((F32)ms_elapsed);
}
//static
@@ -58,6 +57,7 @@ void LLLFSThread::cleanupClass()
{
sLocal->update(0);
}
+ sLocal->shutdown();
delete sLocal;
sLocal = NULL;
}