diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2010-11-11 19:07:02 -0800 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2010-11-11 19:07:02 -0800 |
| commit | 0f26013d1de5836b0be97d34af677f2a021f78fe (patch) | |
| tree | d8efb4943fe1797dfe9214d633fa7563dd36adc0 /indra/llcommon | |
| parent | bfa393f933ccf11105daf5258f373efc764b736f (diff) | |
| parent | 830afa5b27092668517b2f5670e892143de3cf66 (diff) | |
Merge
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llthread.cpp | 2 |
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; |