IMP-590: Added a thread-safe and robust wrapper for APR pools.

See http://redmine.imprudenceviewer.org/issues/590

1 files changed, 3 insertions, 4 deletions

diff --git a/linden/indra/llimage/llimageworker.cpp b/linden/indra/llimage/llimageworker.cpp
index 558a968..dc989e5 100644
--- a/linden/indra/llimage/llimageworker.cpp
+++ b/linden/indra/llimage/llimageworker.cpp
@@ -41,14 +41,13 @@
 LLImageDecodeThread::LLImageDecodeThread(bool threaded)
         : LLQueuedThread("imagedecode", threaded)
 {
-        mCreationMutex = new LLMutex(getAPRPool());
 }
 
 // MAIN THREAD
 // virtual
 S32 LLImageDecodeThread::update(U32 max_time_ms)
 {
-        LLMutexLock lock(mCreationMutex);
+        LLMutexLock lock(&mCreationMutex);
         for (creation_list_t::iterator iter = mCreationList.begin();
                  iter != mCreationList.end(); ++iter)
         {
@@ -71,7 +70,7 @@ S32 LLImageDecodeThread::update(U32 max_time_ms)
 LLImageDecodeThread::handle_t LLImageDecodeThread::decodeImage(LLImageFormatted* image, 
         U32 priority, S32 discard, BOOL needs_aux, Responder* responder)
 {
-        LLMutexLock lock(mCreationMutex);
+        LLMutexLock lock(&mCreationMutex);
         handle_t handle = generateHandle();
         mCreationList.push_back(creation_info(handle, image, priority, discard, needs_aux, responder));
         return handle;
@@ -81,7 +80,7 @@ LLImageDecodeThread::handle_t LLImageDecodeThread::decodeImage(LLImageFormatted*
 // Returns the size of the mutex guarded list as an indication of sanity
 S32 LLImageDecodeThread::tut_size()
 {
-        LLMutexLock lock(mCreationMutex);
+        LLMutexLock lock(&mCreationMutex);
         S32 res = mCreationList.size();
         return res;
 }