diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-07-24 15:10:13 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-07-24 15:10:13 -0500 |
| commit | 0f86c26fa5c7c774e43189dd5ef5d68cb81e6dbf (patch) | |
| tree | 67f26cd98a492f0aff9d4ccb9a276221fdbc5e3a /indra/llcommon/llthread.cpp | |
| parent | 6df418b7af8b8088f72089dc11401db455c26e13 (diff) | |
| parent | 26a9a6929c23eabfef0a53355a392fef0ad26b83 (diff) | |
merge
Diffstat (limited to 'indra/llcommon/llthread.cpp')
| -rw-r--r-- | indra/llcommon/llthread.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llcommon/llthread.cpp b/indra/llcommon/llthread.cpp index d9400fb5b3..4063cc730b 100644 --- a/indra/llcommon/llthread.cpp +++ b/indra/llcommon/llthread.cpp @@ -323,7 +323,8 @@ LLMutex::LLMutex(apr_pool_t *poolp) : LLMutex::~LLMutex() { #if MUTEX_DEBUG - llassert_always(!isLocked()); // better not be locked! + //bad assertion, the subclass LLSignal might be "locked", and that's OK + //llassert_always(!isLocked()); // better not be locked! #endif apr_thread_mutex_destroy(mAPRMutexp); mAPRMutexp = NULL; |