summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2025-04-01 09:11:07 +0800
committerErik Kundiman <erik@megapahit.org>2025-04-01 09:11:07 +0800
commit15ff3eaea87e658e3606b1e6741b555ef6737524 (patch)
tree058ab25f500d98327367d6a7692963cced479d34 /indra/llcommon
parentd9153e3456e618def6b74729ce9a7ace093bb14a (diff)
parente671cb54fee9cb7b7da39953eb96eabc9151f687 (diff)
Merge tag 'Second_Life_Release#e671cb54-2025.03' into 2025.03
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/workqueue.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/workqueue.cpp b/indra/llcommon/workqueue.cpp
index dace95aaf2..c8ece616b2 100644
--- a/indra/llcommon/workqueue.cpp
+++ b/indra/llcommon/workqueue.cpp
@@ -183,12 +183,12 @@ 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 uncaught exception in WorkQueueBase "
+ 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.
+ // Bind the current exception, rethrow it in main loop.
[exc = std::current_exception()]() { std::rethrow_exception(exc); });
}
#endif // else LL_WINDOWS