diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2010-11-10 14:28:54 -0800 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2010-11-10 14:28:54 -0800 |
| commit | 7eed962a6237f74ec980e06d53886259ef225c55 (patch) | |
| tree | 6f90cd7736c74164f5cfaff071ecfc9f63b7a46f /indra/llcommon/llthread.cpp | |
| parent | b2e84d739b4f5c00b497e57e892fc10d78af8b76 (diff) | |
| parent | 9d33a548b636fa739de2aa11ba9ed02b301c53a5 (diff) | |
Merge
Diffstat (limited to 'indra/llcommon/llthread.cpp')
| -rw-r--r-- | indra/llcommon/llthread.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llcommon/llthread.cpp b/indra/llcommon/llthread.cpp index d7b7c3699c..2408be74b9 100644 --- a/indra/llcommon/llthread.cpp +++ b/indra/llcommon/llthread.cpp @@ -153,10 +153,12 @@ void LLThread::shutdown() } delete mRunCondition; + mRunCondition = 0; - if (mIsLocalPool) + if (mIsLocalPool && mAPRPoolp) { apr_pool_destroy(mAPRPoolp); + mAPRPoolp = 0; } } |