summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorAndrew A. de Laix <alain@lindenlab.com>2010-11-11 16:45:38 -0800
committerAndrew A. de Laix <alain@lindenlab.com>2010-11-11 16:45:38 -0800
commit830afa5b27092668517b2f5670e892143de3cf66 (patch)
tree24dd283d25902ee39a507c396fc8ab1fde4ee3e1 /indra/llcommon
parent7a7f89db6d9c5e6b2c6c89ea39c0302907a0442b (diff)
hacking mac updater to install from local dmg
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/llthread.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llcommon/llthread.cpp b/indra/llcommon/llthread.cpp
index 2408be74b9..148aaf8aed 100644
--- a/indra/llcommon/llthread.cpp
+++ b/indra/llcommon/llthread.cpp
@@ -147,6 +147,8 @@ void LLThread::shutdown()
{
// This thread just wouldn't stop, even though we gave it time
llwarns << "LLThread::~LLThread() exiting thread before clean exit!" << llendl;
+ // Put a stake in its heart.
+ apr_thread_exit(mAPRThreadp, -1);
return;
}
mAPRThreadp = NULL;