diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-09-13 12:45:28 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-09-13 12:45:28 -0500 |
| commit | 0a0ae2dd3f3d1f27b5fe13d02118866aa7cbb7d7 (patch) | |
| tree | 88762f0f89dfd7965ab66ee77438cabfd74c4029 /indra/llcommon | |
| parent | 18af6e397ef477287324b510471f640443ce0e33 (diff) | |
STORM-1562 Potential fix for crash in LLCurl::run -- don't run curl_multi_perform from multiple threads simultaneously.
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; } |