diff options
| author | prep <prep@lindenlab.com> | 2010-11-15 14:22:22 -0500 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2010-11-15 14:22:22 -0500 |
| commit | 80561014b0c30b6e3ce04f0a23daed612f3c4075 (patch) | |
| tree | 78d7a01e98a8faefb03c8d85096e69bb933050d8 /indra/llcommon | |
| parent | f9a35fc4c622cf5b151900dd4590818d965a506b (diff) | |
| parent | 1ec846a94e5969e642c63074b78250fb8a2a7df4 (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); } |