diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-10-05 16:39:32 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-10-05 16:39:32 -0700 |
| commit | d8489166645f2e3ea7edd252997f9f48aa0871c3 (patch) | |
| tree | e2f5c52f0c397b0dfb1d0e3cb47ca59d609292dc /indra/llcommon/llthread.h | |
| parent | 17c699e4281ffff58e24c5db960a5c33018f1747 (diff) | |
| parent | a88bb3231b2685eb640710d7617d26b7f3a2c0d2 (diff) | |
Merge with latest
Diffstat (limited to 'indra/llcommon/llthread.h')
| -rw-r--r-- | indra/llcommon/llthread.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llcommon/llthread.h b/indra/llcommon/llthread.h index c732e3bc77..b631b96252 100644 --- a/indra/llcommon/llthread.h +++ b/indra/llcommon/llthread.h @@ -195,7 +195,8 @@ public: } ~LLMutex() { - llassert(!isLocked()); // better not be locked! + //this assertion erroneously triggers whenever an LLCondition is destroyed + //llassert(!isLocked()); // better not be locked! apr_thread_mutex_destroy(mAPRMutexp); mAPRMutexp = NULL; } |