diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-10-05 15:12:07 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-10-05 15:12:07 -0700 |
| commit | 11a0d0cd59c86cee18b6b2fd92fcbac62502ede0 (patch) | |
| tree | 74dba5131b40874232a8dd50a2a79f9d81d3f143 /indra/llcommon/llthread.h | |
| parent | 6f9ed8b303e9e840fcd624b03ec0958dceba3dc7 (diff) | |
| parent | eda12bd009d8f71eb82b6e6238335a172d6e5fb0 (diff) | |
merge
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; } |