diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-11-11 11:23:10 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-11-11 11:23:10 -0600 |
| commit | d682394d027e93b1b98e213f588126194ec517d1 (patch) | |
| tree | 8844ad2eb02dcb0e2278935d6d9b098e52dc1de4 /indra/llcommon | |
| parent | 2551bfb1b523c1ce2459e0139829a211c36e1bcc (diff) | |
| parent | ce667514032510ff1ae47daf0f2727933be849bc (diff) | |
merge
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llthread.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llcommon/llthread.cpp b/indra/llcommon/llthread.cpp index 9a33324129..59e28948f5 100644 --- a/indra/llcommon/llthread.cpp +++ b/indra/llcommon/llthread.cpp @@ -406,6 +406,10 @@ LLCondition::~LLCondition() void LLCondition::wait() { + if (!isLocked()) + { //mAPRMutexp MUST be locked before calling apr_thread_cond_wait + apr_thread_mutex_lock(mAPRMutexp); + } apr_thread_cond_wait(mAPRCondp, mAPRMutexp); } |