summaryrefslogtreecommitdiff
path: root/indra/llcommon/llthread.cpp
diff options
context:
space:
mode:
authorDave Houlton <euclid@lindenlab.com>2021-07-19 15:55:57 -0600
committerDave Houlton <euclid@lindenlab.com>2021-07-19 15:55:57 -0600
commit4c849ba91363f82da05cce1221b04075a6ca72af (patch)
tree33edfb0495161594a50dcfbed3a3f42e7fde9143 /indra/llcommon/llthread.cpp
parentdc14dbf54d332a6cdc43002bb71ed71e9a473647 (diff)
parentbe6066eae218856f7fd74b98968a75e5062fa830 (diff)
Merge branch 'master' v 6.4.22 into DRTVWR-528
Diffstat (limited to 'indra/llcommon/llthread.cpp')
-rw-r--r--indra/llcommon/llthread.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llcommon/llthread.cpp b/indra/llcommon/llthread.cpp
index 98905f3b71..6d531d842d 100644
--- a/indra/llcommon/llthread.cpp
+++ b/indra/llcommon/llthread.cpp
@@ -354,8 +354,9 @@ void LLThread::setQuitting()
{
mStatus = QUITTING;
}
+ // It's only safe to remove mRunCondition if all locked threads were notified
+ mRunCondition->broadcast();
mDataLock->unlock();
- wake();
}
// static