diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-02-11 17:31:56 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-02-11 17:31:56 -0500 |
| commit | a4135cd3aa8be0d1d17174c2ccdce36cbf235367 (patch) | |
| tree | 8f13dd7abefb2c8ac553cab0143780914ae65f4a /indra/llcommon/llthread.cpp | |
| parent | 344ddaf9f5945c63c39774f9619069629430e70b (diff) | |
| parent | f546f06452f453cf062d166ddebefd98afbd118b (diff) | |
merge
Diffstat (limited to 'indra/llcommon/llthread.cpp')
| -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); } |