diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-02-09 20:07:03 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-02-09 20:07:03 -0600 |
| commit | 952c3eaaa8c78d00ef62932d46af1d8fa565e7b2 (patch) | |
| tree | 27656fd1b1d365b92bb45015c53afe7a8c033f17 /indra/llcommon | |
| parent | fd6c5296b6c25afeaf83af51a45bf95331594797 (diff) | |
| parent | d94117b80b67b6d27d2b2e14fb420682474e439e (diff) | |
merge
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llthread.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llcommon/llthread.cpp b/indra/llcommon/llthread.cpp index b4617c5453..d9400fb5b3 100644 --- a/indra/llcommon/llthread.cpp +++ b/indra/llcommon/llthread.cpp @@ -425,6 +425,11 @@ void LLCondition::wait() if (!isLocked()) { //mAPRMutexp MUST be locked before calling apr_thread_cond_wait apr_thread_mutex_lock(mAPRMutexp); +#if MUTEX_DEBUG + // avoid asserts on destruction in non-release builds + U32 id = LLThread::currentID(); + mIsLocked[id] = TRUE; +#endif } apr_thread_cond_wait(mAPRCondp, mAPRMutexp); } |