diff options
| author | Tofu Buzzard <no-email> | 2011-02-09 19:23:47 -0800 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-02-09 19:23:47 -0800 |
| commit | cc6602c0c7fa34d712127cb98b24fcc73641fc19 (patch) | |
| tree | 097c5df1a3dbf84f7115947abc3b4e90b0d4ab87 /indra/llcommon | |
| parent | 2a49b392a40808a6415839dd767f849b6ea26020 (diff) | |
| parent | c213618b53d3a18c12afe21d4327d7d86095feaa (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); } |