Merge branch 'weekly' into branding

Conflicts (solved):
	linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
	linden/indra/newview/llappviewer.cpp
	linden/indra/newview/llappviewerwin32.cpp

4 files changed, 10 insertions, 16 deletions

diff --git a/linden/indra/llimage/llimage.cpp b/linden/indra/llimage/llimage.cpp
index 776c481..e933750 100644
--- a/linden/indra/llimage/llimage.cpp
+++ b/linden/indra/llimage/llimage.cpp
@@ -57,7 +57,7 @@ LLMutex* LLImage::sMutex = NULL;
 //static
 void LLImage::initClass(const bool& useDSO)
 {
-        sMutex = new LLMutex(NULL);
+        sMutex = new LLMutex;
         if (useDSO)
         {
                 LLImageJ2C::openDSO();
diff --git a/linden/indra/llimage/llimagej2c.cpp b/linden/indra/llimage/llimagej2c.cpp
index b99ebff..9e88bcd 100644
--- a/linden/indra/llimage/llimagej2c.cpp
+++ b/linden/indra/llimage/llimagej2c.cpp
@@ -46,7 +46,7 @@ typedef const char* (*EngineInfoLLImageJ2CFunction)();
 CreateLLImageJ2CFunction j2cimpl_create_func;
 DestroyLLImageJ2CFunction j2cimpl_destroy_func;
 EngineInfoLLImageJ2CFunction j2cimpl_engineinfo_func;
-apr_pool_t *j2cimpl_dso_memory_pool;
+AIAPRPool j2cimpl_dso_memory_pool;
 apr_dso_handle_t *j2cimpl_dso_handle;
 
 //Declare the prototype for theses functions here, their functionality
@@ -81,13 +81,12 @@ void LLImageJ2C::openDSO()
                                        gDirUtilp->getExecutableDir());
 
         j2cimpl_dso_handle      = NULL;
-        j2cimpl_dso_memory_pool = NULL;
+        j2cimpl_dso_memory_pool.create();
 
         //attempt to load the shared library
-        apr_pool_create(&j2cimpl_dso_memory_pool, NULL);
         rv = apr_dso_load(&j2cimpl_dso_handle,
                                           dso_path.c_str(),
-                                          j2cimpl_dso_memory_pool);
+                                          j2cimpl_dso_memory_pool());
 
         //now, check for success
         if ( rv == APR_SUCCESS )
@@ -151,11 +150,7 @@ void LLImageJ2C::openDSO()
                         j2cimpl_dso_handle = NULL;
                 }
 
-                if ( j2cimpl_dso_memory_pool )
-                {
-                        apr_pool_destroy(j2cimpl_dso_memory_pool);
-                        j2cimpl_dso_memory_pool = NULL;
-                }
+                j2cimpl_dso_memory_pool.destroy();
         }
 }
 
@@ -163,7 +158,7 @@ void LLImageJ2C::openDSO()
 void LLImageJ2C::closeDSO()
 {
         if ( j2cimpl_dso_handle ) apr_dso_unload(j2cimpl_dso_handle);
-        if (j2cimpl_dso_memory_pool) apr_pool_destroy(j2cimpl_dso_memory_pool);
+        j2cimpl_dso_memory_pool.destroy();
 }
 
 //static
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;
 }
diff --git a/linden/indra/llimage/llimageworker.h b/linden/indra/llimage/llimageworker.h
index 0260206..fa2a8fa 100644
--- a/linden/indra/llimage/llimageworker.h
+++ b/linden/indra/llimage/llimageworker.h
@@ -101,7 +101,7 @@ private:
         };
         typedef std::list<creation_info> creation_list_t;
         creation_list_t mCreationList;
-        LLMutex* mCreationMutex;
+        LLMutex mCreationMutex;
 };
 
 #endif