diff options
| author | Tofu Buzzard <no-email> | 2011-02-09 19:23:19 -0800 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-02-09 19:23:19 -0800 |
| commit | c213618b53d3a18c12afe21d4327d7d86095feaa (patch) | |
| tree | f7dfe30ffeb5c5ed494009421746acf903a12adf /indra/llcommon | |
| parent | 8c718d51873cbbe3e00042329ac8c7c6396ae9c2 (diff) | |
| parent | 952c3eaaa8c78d00ef62932d46af1d8fa565e7b2 (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); } |