summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-07-22 02:33:55 -0500
committerDave Parks <davep@lindenlab.com>2011-07-22 02:33:55 -0500
commite4a8ef4ce2572db98d08233c58e23d3ec75f30d7 (patch)
tree59d20733dd85bede5bfa89b2476ed06e7d67b689 /indra/llcommon
parentc3378885536c5b7d3dd503ed6867cf5d6a8b1370 (diff)
SH-2031 Cleanup from threaded curl implementation (remove errors/loops on shutdown).
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/llthread.cpp3
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;