1 files changed, 10 insertions, 0 deletions

diff --git a/linden/indra/llcommon/llapr.cpp b/linden/indra/llcommon/llapr.cpp
index 82530b1..669afc5 100644
--- a/linden/indra/llcommon/llapr.cpp
+++ b/linden/indra/llcommon/llapr.cpp
@@ -38,6 +38,7 @@
 apr_pool_t *gAPRPoolp = NULL; // Global APR memory pool
 LLVolatileAPRPool *LLAPRFile::sAPRFilePoolp = NULL ; //global volatile APR memory pool.
 apr_thread_mutex_t *gLogMutexp = NULL;
+apr_thread_mutex_t *gCallStacksLogMutexp = NULL;
 
 const S32 FULL_VOLATILE_APR_POOL = 1024 ; //number of references to LLVolatileAPRPool
 
@@ -51,6 +52,7 @@ void ll_init_apr()
                 
                 // Initialize the logging mutex
                 apr_thread_mutex_create(&gLogMutexp, APR_THREAD_MUTEX_UNNESTED, gAPRPoolp);
+                apr_thread_mutex_create(&gCallStacksLogMutexp, APR_THREAD_MUTEX_UNNESTED, gAPRPoolp);
         }
 
         if(!LLAPRFile::sAPRFilePoolp)
@@ -72,6 +74,14 @@ void ll_cleanup_apr()
                 apr_thread_mutex_destroy(gLogMutexp);
                 gLogMutexp = NULL;
         }
+        if (gCallStacksLogMutexp)
+        {
+                // Clean up the logging mutex
+
+                // All other threads NEED to be done before we clean up APR, so this is okay.
+                apr_thread_mutex_destroy(gCallStacksLogMutexp);
+                gCallStacksLogMutexp = NULL;
+        }
         if (gAPRPoolp)
         {
                 apr_pool_destroy(gAPRPoolp);