Second Life viewer sources 1.21.1-RC

4 files changed, 43 insertions, 7 deletions

diff --git a/linden/indra/llcommon/llapr.cpp b/linden/indra/llcommon/llapr.cpp
index 73e715a..17c753d 100644
--- a/linden/indra/llcommon/llapr.cpp
+++ b/linden/indra/llcommon/llapr.cpp
@@ -73,6 +73,28 @@ void ll_cleanup_apr()
 }
 
 //
+//LLAPRPool
+//
+LLAPRPool::LLAPRPool(apr_pool_t *parent, apr_size_t size) 
+{
+        mStatus = apr_pool_create(&mPool, parent);
+
+        if(size > 0) //size is the number of blocks (which is usually 4K), NOT bytes.
+        {
+                apr_allocator_t *allocator = apr_pool_allocator_get(mPool); 
+                if (allocator) 
+                { 
+                        apr_allocator_max_free_set(allocator, size) ;
+                }
+        }
+}
+
+LLAPRPool::~LLAPRPool() 
+{
+        apr_pool_destroy(mPool) ;
+}
+
+//
 // LLScopedLock
 //
 LLScopedLock::LLScopedLock(apr_thread_mutex_t* mutex) : mMutex(mutex)
diff --git a/linden/indra/llcommon/llapr.h b/linden/indra/llcommon/llapr.h
index 323dcb2..1b91d37 100644
--- a/linden/indra/llcommon/llapr.h
+++ b/linden/indra/llcommon/llapr.h
@@ -60,6 +60,20 @@ void ll_init_apr();
  */
 void ll_cleanup_apr();
 
+class LLAPRPool
+{
+public:
+        LLAPRPool(apr_pool_t *parent = NULL, apr_size_t size = 0) ;
+        ~LLAPRPool() ;
+
+        apr_pool_t* getAPRPool() {return mPool ; }
+        apr_status_t getStatus() {return mStatus ; }
+
+private:
+        apr_pool_t*  mPool ;
+        apr_status_t mStatus ;
+} ;
+
 /** 
  * @class LLScopedLock
  * @brief Small class to help lock and unlock mutexes.
diff --git a/linden/indra/llcommon/llthread.cpp b/linden/indra/llcommon/llthread.cpp
index e07170b..822adc2 100644
--- a/linden/indra/llcommon/llthread.cpp
+++ b/linden/indra/llcommon/llthread.cpp
@@ -266,12 +266,12 @@ void LLThread::wakeLocked()
 LLMutex::LLMutex(apr_pool_t *poolp) :
         mAPRMutexp(NULL)
 {
-        if (poolp)
-        {
-                mIsLocalPool = FALSE;
-                mAPRPoolp = poolp;
-        }
-        else
+        //if (poolp)
+        //{
+        //      mIsLocalPool = FALSE;
+        //      mAPRPoolp = poolp;
+        //}
+        //else
         {
                 mIsLocalPool = TRUE;
                 apr_pool_create(&mAPRPoolp, NULL); // Create a subpool for this thread
diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index 4820f68..cd7b304 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -34,7 +34,7 @@
 
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 21;
-const S32 LL_VERSION_PATCH = 0;
+const S32 LL_VERSION_PATCH = 1;
 const S32 LL_VERSION_BUILD = 0;
 
 const char * const LL_CHANNEL = "Second Life Release";