diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-09-16 09:13:38 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-09-16 09:13:38 -0400 |
| commit | ac918730bee5d2970e2df0edaa544168486e6e54 (patch) | |
| tree | 222639d254108403d20b47657063670daaad35bd /indra/llcommon | |
| parent | 7f10e89ce919ad35907cd4237a78b831375ffb75 (diff) | |
| parent | 1a0865a57220434a49b106a47170c3dae45dcb13 (diff) | |
merge
Diffstat (limited to 'indra/llcommon')
| -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; } |