Ported many APR changes from Snowglobe.

1 files changed, 3 insertions, 8 deletions

diff --git a/linden/indra/llcommon/llthread.cpp b/linden/indra/llcommon/llthread.cpp
index 37b03a4..b39ffb6 100644
--- a/linden/indra/llcommon/llthread.cpp
+++ b/linden/indra/llcommon/llthread.cpp
@@ -72,6 +72,9 @@ void *APR_THREAD_FUNC LLThread::staticRun(apr_thread_t *apr_threadp, void *datap
         // Set thread state to running
         threadp->mStatus = RUNNING;
 
+        // Create a thread local APRFile pool.
+        LLVolatileAPRPool::createLocalAPRFilePool();
+
         // Run the user supplied function
         threadp->run();
 
@@ -102,20 +105,12 @@ LLThread::LLThread(const std::string& name, apr_pool_t *poolp) :
                 apr_pool_create(&mAPRPoolp, NULL); // Create a subpool for this thread
         }
         mRunCondition = new LLCondition(mAPRPoolp);
-
-        mLocalAPRFilePoolp = NULL ;
 }
 
 
 LLThread::~LLThread()
 {
         shutdown();
-
-        if(mLocalAPRFilePoolp)
-        {
-                delete mLocalAPRFilePoolp ;
-                mLocalAPRFilePoolp = NULL ;
-        }
 }
 
 void LLThread::shutdown()