diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-08-31 10:48:56 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-08-31 10:48:56 -0600 |
| commit | 749d9ebadcd201e27a9453de7a2d9320d78efbb5 (patch) | |
| tree | 6e2119ba44dd37543a81c2b67644c5fa1ac2b698 /indra/llcommon/llworkerthread.cpp | |
| parent | bdd053abcffea1f4c30421176d0a3749027c6b7d (diff) | |
| parent | 48d949150cd445ce1e801a7a8ee67597a965f14b (diff) | |
Merge
Diffstat (limited to 'indra/llcommon/llworkerthread.cpp')
| -rw-r--r-- | indra/llcommon/llworkerthread.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/indra/llcommon/llworkerthread.cpp b/indra/llcommon/llworkerthread.cpp index 3ac50832fd..6b308bb917 100644 --- a/indra/llcommon/llworkerthread.cpp +++ b/indra/llcommon/llworkerthread.cpp @@ -37,12 +37,7 @@ LLWorkerThread::LLWorkerThread(const std::string& name, bool threaded) : LLQueuedThread(name, threaded) { - mDeleteMutex = new LLMutex(NULL); - - if(!mLocalAPRFilePoolp) - { - mLocalAPRFilePoolp = new LLVolatileAPRPool() ; - } + mDeleteMutex = new LLMutex; } LLWorkerThread::~LLWorkerThread() @@ -204,7 +199,6 @@ LLWorkerClass::LLWorkerClass(LLWorkerThread* workerthread, const std::string& na mWorkerClassName(name), mRequestHandle(LLWorkerThread::nullHandle()), mRequestPriority(LLWorkerThread::PRIORITY_NORMAL), - mMutex(NULL), mWorkFlags(0) { if (!mWorkerThread) |