From fc7b5549cb6092194d11b8d87600f21992305c1c Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 31 May 2022 16:54:05 -0500
Subject: SL-17484 Fix for unit tests.  Deprecate non-threaded LLQueuedThread
 and make lllfsthread threaded.

---
 indra/llcommon/llqueuedthread.cpp | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

(limited to 'indra/llcommon/llqueuedthread.cpp')

diff --git a/indra/llcommon/llqueuedthread.cpp b/indra/llcommon/llqueuedthread.cpp
index 871c42f7ee..60304fff75 100644
--- a/indra/llcommon/llqueuedthread.cpp
+++ b/indra/llcommon/llqueuedthread.cpp
@@ -37,12 +37,13 @@
 // MAIN THREAD
 LLQueuedThread::LLQueuedThread(const std::string& name, bool threaded, bool should_pause) :
     LLThread(name),
-    mThreaded(threaded),
     mIdleThread(TRUE),
     mNextHandle(0),
     mStarted(FALSE),
+    mThreaded(threaded),
     mRequestQueue(name, 1024 * 1024)
 {
+    llassert(threaded); // not threaded implementation is deprecated
     mMainQueue = LL::WorkQueue::getInstance("mainloop");
 
 	if (mThreaded)
@@ -138,14 +139,18 @@ S32 LLQueuedThread::updateQueue(F32 max_time_ms)
 	if (mThreaded)
 	{
         // schedule a call to threadedUpdate for every call to updateQueue
-        mRequestQueue.post([=]() 
-            {
-                LL_PROFILE_ZONE_NAMED_CATEGORY_THREAD("qt - update");
-                mIdleThread = FALSE;
-                threadedUpdate(); 
-                mIdleThread = TRUE;
-            }
-        );
+        if (!isQuitting())
+        {
+            mRequestQueue.post([=]()
+                {
+                    LL_PROFILE_ZONE_NAMED_CATEGORY_THREAD("qt - update");
+                    mIdleThread = FALSE;
+                    threadedUpdate();
+                    mIdleThread = TRUE;
+                }
+            );
+        }
+
 		if(getPending() > 0)
 		{
 		    unpause();
-- 
cgit v1.2.3