diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-10-14 11:58:35 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-10-14 11:58:35 -0500 |
| commit | c0ca8e5e2e4d3f591db3175f09c0b64b6b2e10c5 (patch) | |
| tree | 28ea7a212319b0bd452c68e54f374904bfe6ed8a /indra/llcommon/llworkerthread.cpp | |
| parent | fc2929bf4f6366c3a3386e4b79b0fda7bd0466ba (diff) | |
| parent | 4331c112aba074562e9a8826fe6d271a94f790f0 (diff) | |
Merge backout of b782a75c99e6
Diffstat (limited to 'indra/llcommon/llworkerthread.cpp')
| -rw-r--r-- | indra/llcommon/llworkerthread.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/llcommon/llworkerthread.cpp b/indra/llcommon/llworkerthread.cpp index e186621503..4988bdf570 100644 --- a/indra/llcommon/llworkerthread.cpp +++ b/indra/llcommon/llworkerthread.cpp @@ -37,7 +37,12 @@ LLWorkerThread::LLWorkerThread(const std::string& name, bool threaded, bool should_pause) : LLQueuedThread(name, threaded, should_pause) { - mDeleteMutex = new LLMutex; + mDeleteMutex = new LLMutex(NULL); + + if(!mLocalAPRFilePoolp) + { + mLocalAPRFilePoolp = new LLVolatileAPRPool() ; + } } LLWorkerThread::~LLWorkerThread() @@ -199,6 +204,7 @@ LLWorkerClass::LLWorkerClass(LLWorkerThread* workerthread, const std::string& na mWorkerClassName(name), mRequestHandle(LLWorkerThread::nullHandle()), mRequestPriority(LLWorkerThread::PRIORITY_NORMAL), + mMutex(NULL), mWorkFlags(0) { if (!mWorkerThread) |