Revert "SL-18721 Viewer shutdown order changes"

This reverts commit edf0874e0656c6f512df50ee52236209531ca329.
Reverted since it causes a significant uptick in shutdown freezes.
Can't repro those freezes, will seek an alternate solution.

2 files changed, 3 insertions, 12 deletions

diff --git a/indra/llcommon/threadpool.cpp b/indra/llcommon/threadpool.cpp
index 22bbff4478..d5adf11264 100644
--- a/indra/llcommon/threadpool.cpp
+++ b/indra/llcommon/threadpool.cpp
@@ -21,12 +21,11 @@
 #include "llevents.h"
 #include "stringize.h"
 
-LL::ThreadPool::ThreadPool(const std::string& name, size_t threads, size_t capacity, bool auto_shutdown):
+LL::ThreadPool::ThreadPool(const std::string& name, size_t threads, size_t capacity):
     super(name),
     mQueue(name, capacity),
     mName("ThreadPool:" + name),
-    mThreadCount(threads),
-    mAutomaticShutdown(auto_shutdown)
+    mThreadCount(threads)
 {}
 
 void LL::ThreadPool::start()
@@ -40,13 +39,6 @@ void LL::ThreadPool::start()
                 run(tname);
             });
     }
-
-    // Some threads might need to run longer than LLEventPumps
-    if (!mAutomaticShutdown)
-    {
-        return;
-    }
-
     // Listen on "LLApp", and when the app is shutting down, close the queue
     // and join the workers.
     LLEventPumps::instance().obtain("LLApp").listen(
diff --git a/indra/llcommon/threadpool.h b/indra/llcommon/threadpool.h
index 22c875edb9..f8eec3b457 100644
--- a/indra/llcommon/threadpool.h
+++ b/indra/llcommon/threadpool.h
@@ -31,7 +31,7 @@ namespace LL
          * Pass ThreadPool a string name. This can be used to look up the
          * relevant WorkQueue.
          */
-        ThreadPool(const std::string& name, size_t threads=1, size_t capacity=1024, bool auto_shutdown = true);
+        ThreadPool(const std::string& name, size_t threads=1, size_t capacity=1024);
         virtual ~ThreadPool();
 
         /**
@@ -66,7 +66,6 @@ namespace LL
         std::string mName;
         size_t mThreadCount;
         std::vector<std::pair<std::string, std::thread>> mThreads;
-        bool mAutomaticShutdown;
     };
 
 } // namespace LL