Second Life viewer sources 1.23.0-RC

1 files changed, 11 insertions, 10 deletions

diff --git a/linden/indra/llcommon/llworkerthread.cpp b/linden/indra/llcommon/llworkerthread.cpp
index 96a957b..5dda600 100644
--- a/linden/indra/llcommon/llworkerthread.cpp
+++ b/linden/indra/llcommon/llworkerthread.cpp
@@ -16,7 +16,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -36,16 +37,18 @@
 #include "llframecallbackmanager.h"
 #endif
 
-BOOL LLWorkerClass::sDeleteLock = FALSE ;
 //============================================================================
 // Run on MAIN thread
 
 LLWorkerThread::LLWorkerThread(const std::string& name, bool threaded) :
-        LLQueuedThread(name, threaded),
-        mWorkerAPRPoolp(NULL)
+        LLQueuedThread(name, threaded)
 {
-        apr_pool_create(&mWorkerAPRPoolp, NULL);
-        mDeleteMutex = new LLMutex(getAPRPool());
+        mDeleteMutex = new LLMutex(NULL);
+
+        if(!mLocalAPRFilePoolp)
+        {
+                mLocalAPRFilePoolp = new LLVolatileAPRPool() ;
+        }
 }
 
 LLWorkerThread::~LLWorkerThread()
@@ -95,7 +98,6 @@ S32 LLWorkerThread::update(U32 max_time_ms)
         {
                 (*iter)->abortWork(false);
         }
-        LLWorkerClass::sDeleteLock = TRUE ;
         for (std::vector<LLWorkerClass*>::iterator iter = delete_list.begin();
                  iter != delete_list.end(); ++iter)
         {
@@ -109,8 +111,7 @@ S32 LLWorkerThread::update(U32 max_time_ms)
                 }
                 delete *iter;
         }
-        LLWorkerClass::sDeleteLock = FALSE ;
-    // delete and aborted entries mean there's still work to do
+        // delete and aborted entries mean there's still work to do
         res += delete_list.size() + abort_list.size();
         return res;
 }
@@ -187,7 +188,7 @@ LLWorkerClass::LLWorkerClass(LLWorkerThread* workerthread, const std::string& na
         : mWorkerThread(workerthread),
           mWorkerClassName(name),
           mRequestHandle(LLWorkerThread::nullHandle()),
-          mMutex(workerthread->getWorkerAPRPool()),
+          mMutex(NULL),
           mWorkFlags(0)
 {
         if (!mWorkerThread)