From d089e84d531e2cb87c20a8ee43c5a4529e048431 Mon Sep 17 00:00:00 2001
From: Nicky <sl.nicky.ml@googlemail.com>
Date: Thu, 5 Apr 2018 17:49:07 +0200
Subject: [PATCH] Remove now unused APR pool.

---
 indra/llcommon/llthread.cpp | 17 -----------------
 indra/llcommon/llthread.h   |  3 ---
 2 files changed, 20 deletions(-)

diff --git a/indra/llcommon/llthread.cpp b/indra/llcommon/llthread.cpp
index 73c91a5210..e1564339f7 100644
--- a/indra/llcommon/llthread.cpp
+++ b/indra/llcommon/llthread.cpp
@@ -170,17 +170,6 @@ LLThread::LLThread(const std::string& name, apr_pool_t *poolp) :
 
     mID = ++sIDIter;
 	
-    // Thread creation probably CAN be paranoid about APR being initialized, if necessary
-    if (poolp)
-    {
-        mIsLocalPool = FALSE;
-        mAPRPoolp = poolp;
-    }
-    else
-    {
-        mIsLocalPool = TRUE;
-        apr_pool_create(&mAPRPoolp, NULL); // Create a subpool for this thread
-    }
     mRunCondition = new LLCondition();
     mDataLock = new LLMutex();
     mLocalAPRFilePoolp = NULL ;
@@ -260,12 +249,6 @@ void LLThread::shutdown()
     delete mDataLock;
     mDataLock = NULL;
     
-    if (mIsLocalPool && mAPRPoolp)
-    {
-        apr_pool_destroy(mAPRPoolp);
-        mAPRPoolp = 0;
-    }
-
     if (mRecorder)
     {
         // missed chance to properly shut down recorder (needs to be done in thread context)
diff --git a/indra/llcommon/llthread.h b/indra/llcommon/llthread.h
index c5a8c59852..9c24875db2 100644
--- a/indra/llcommon/llthread.h
+++ b/indra/llcommon/llthread.h
@@ -88,7 +88,6 @@ public:
     // this kicks off the apr thread
     void start(void);
 
-    apr_pool_t *getAPRPool() { return mAPRPoolp; }
     LLVolatileAPRPool* getLocalAPRFilePool() { return mLocalAPRFilePoolp ; }
 
     U32 getID() const { return mID; }
@@ -109,8 +108,6 @@ protected:
     LLMutex*            mDataLock;
 
     std::thread        *mThreadp;
-    apr_pool_t          *mAPRPoolp;
-    BOOL                mIsLocalPool;
     EThreadStatus       mStatus;
     U32                 mID;
     LLTrace::ThreadRecorder* mRecorder;