#6014 Reduce shutdown delays on thread cleanup

1 files changed, 10 insertions, 0 deletions

diff --git a/indra/llcommon/llwatchdog.cpp b/indra/llcommon/llwatchdog.cpp
index fd0702733c..056a0cc940 100644
--- a/indra/llcommon/llwatchdog.cpp
+++ b/indra/llcommon/llwatchdog.cpp
@@ -51,6 +51,7 @@ public:
     {
         mStopping = true;
         mSleepMsecs = 1;
+        setQuitting();
     }
 
     void run() override
@@ -225,11 +226,20 @@ void LLWatchdog::init(
     mCrashOnFreeze = crash_on_freeze;
 }
 
+void LLWatchdog::shutdown()
+{
+    if (mTimer)
+    {
+        mTimer->stop();
+    }
+}
+
 void LLWatchdog::cleanup()
 {
     if (mTimer)
     {
         mTimer->stop();
+        mTimer->shutdown();
         delete mTimer;
         mTimer = nullptr;
     }