diff options
| author | prep linden <prep@lindenlab.com> | 2011-09-16 15:45:56 -0400 |
|---|---|---|
| committer | prep linden <prep@lindenlab.com> | 2011-09-16 15:45:56 -0400 |
| commit | 2aa385aeaf7ff57e19278f27fcf4c6a23f97ea30 (patch) | |
| tree | 5bfa7f59c354d59f5e565aafa226b4dcc835c214 /indra/llcommon | |
| parent | 1a7e1661040c9295c405e72e361307109514fc9b (diff) | |
| parent | ac918730bee5d2970e2df0edaa544168486e6e54 (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; } |