Merge branch '2025.05' into 2025.06

1 files changed, 16 insertions, 8 deletions

diff --git a/indra/llcommon/workqueue.cpp b/indra/llcommon/workqueue.cpp
index 0eb20323ad..7efaebd569 100644
--- a/indra/llcommon/workqueue.cpp
+++ b/indra/llcommon/workqueue.cpp
@@ -210,14 +210,22 @@ void LL::WorkQueueBase::callWork(const Work& work)
     }
     catch (...)
     {
-        // Stash any other kind of uncaught exception to be rethrown by main thread.
-        LL_WARNS("LLCoros") << "Capturing and rethrowing uncaught exception in WorkQueueBase "
-            << getKey() << LL_ENDL;
-
-        LL::WorkQueue::ptr_t main_queue = LL::WorkQueue::getInstance("mainloop");
-        main_queue->post(
-            // Bind the current exception, rethrow it in main loop.
-            [exc = std::current_exception()]() { std::rethrow_exception(exc); });
+        if (getKey() != "mainloop")
+        {
+            // Stash any other kind of uncaught exception to be rethrown by main thread.
+            LL_WARNS("LLCoros") << "Capturing and rethrowing uncaught exception in WorkQueueBase "
+                                << getKey() << LL_ENDL;
+
+            LL::WorkQueue::ptr_t main_queue = LL::WorkQueue::getInstance("mainloop");
+            main_queue->post(
+                             // Bind the current exception, rethrow it in main loop.
+                             [exc = std::current_exception()]() { std::rethrow_exception(exc); });
+        }
+        else
+        {
+            // let main loop crash
+            throw;
+        }
     }
 #endif // else LL_WINDOWS
 }