diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-09-16 12:18:16 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-09-16 12:18:16 -0400 |
| commit | 50896aafe53759ed0b5b8bcd4a835957dd2a0e4f (patch) | |
| tree | aca350fe09949fcb30e42b384a85ab94d1602bc4 /indra/llcommon | |
| parent | fa70b619efcdaad27db6548f9eed235e191bd4ec (diff) | |
| parent | 2fba01d160716b886a7dfc0c86abda767a25d23f (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; } |