diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-05 19:09:28 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-05 19:09:28 -0400 |
| commit | 8c5da0552db39ba6031b76ffb08994e53217a559 (patch) | |
| tree | f4ac194d15a0a58475496543bbb36d587d195b4f /indra/llcommon/llthread.cpp | |
| parent | fce8bda3b6e502b3de9b6a34279255999478e407 (diff) | |
| parent | 8675901fa85de600cc1ef7c5263a5906fd2b2811 (diff) | |
merged .hgtags
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; |