diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-09-14 11:21:53 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-09-14 11:21:53 -0400 |
| commit | 11340e3eb3011930f2765d452685632112775cf1 (patch) | |
| tree | d712ccdaa7cf818aaa08defb45d5393fe7d1a0e4 /indra/llcommon | |
| parent | a3e092db14cd0ca785ae46b99f6e275eedc0ddc1 (diff) | |
| parent | 19371a9abed3198f9f6083c3b2483e65778e944a (diff) | |
merge possible fix for storm-1562
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; } |