Second Life viewer sources 1.23.0-RC

1 files changed, 3 insertions, 6 deletions

diff --git a/linden/indra/llcommon/llworkerthread.h b/linden/indra/llcommon/llworkerthread.h
index 62b0696..19407f4 100644
--- a/linden/indra/llcommon/llworkerthread.h
+++ b/linden/indra/llcommon/llworkerthread.h
@@ -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,
@@ -37,6 +38,7 @@
 #include <set>
 
 #include "llqueuedthread.h"
+#include "llapr.h"
 
 #define USE_FRAME_CALLBACK_MANAGER 0
 
@@ -81,14 +83,11 @@ private:
         typedef std::list<LLWorkerClass*> delete_list_t;
         delete_list_t mDeleteList;
         LLMutex* mDeleteMutex;
-        apr_pool_t* mWorkerAPRPoolp;
         
 public:
         LLWorkerThread(const std::string& name, bool threaded = true);
         ~LLWorkerThread();
 
-        apr_pool_t* getWorkerAPRPool() { return mWorkerAPRPoolp; }
-        
         /*virtual*/ S32 update(U32 max_time_ms);
         
         handle_t addWorkRequest(LLWorkerClass* workerclass, S32 param, U32 priority = PRIORITY_NORMAL);
@@ -120,8 +119,6 @@ class LLWorkerClass
         friend class LLWorkerThread::WorkRequest;
 
 public:
-        static BOOL sDeleteLock ;
-public:
         typedef LLWorkerThread::handle_t handle_t;
         enum FLAGS
         {