From fe4d90f8a5c0d37637e43f9ad25e70bbc87fc8c3 Mon Sep 17 00:00:00 2001 From: Wolfspirit Date: Wed, 24 Aug 2011 05:13:11 +0200 Subject: [PATCH] (Should) fix some race conditions on start when threads are created --- indra/llcommon/llthread.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/indra/llcommon/llthread.cpp b/indra/llcommon/llthread.cpp index 49d05ef411..56d3517b35 100644 --- a/indra/llcommon/llthread.cpp +++ b/indra/llcommon/llthread.cpp @@ -285,12 +285,12 @@ void LLThread::wakeLocked() LLMutex::LLMutex(apr_pool_t *poolp) : mAPRMutexp(NULL) { - //if (poolp) - //{ - // mIsLocalPool = FALSE; - // mAPRPoolp = poolp; - //} - //else + if (poolp) + { + mIsLocalPool = FALSE; + mAPRPoolp = poolp; + } + else { mIsLocalPool = TRUE; apr_pool_create(&mAPRPoolp, NULL); // Create a subpool for this thread