diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-10-05 14:57:19 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-10-05 14:57:19 -0700 |
| commit | d41f496510a2bc489efb9ae4479a70646eb989b8 (patch) | |
| tree | d11fd42ebdafd26bd76231c3ae56ca22410b2d86 /indra/llcommon/llthread.h | |
| parent | 00dc8b3982cf69dbe69b8c1913e701c37f22eba0 (diff) | |
| parent | eda12bd009d8f71eb82b6e6238335a172d6e5fb0 (diff) | |
EXP-1202 : pull from richard/viewer-experience-fui
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; } |