QAR-855 Viewer 1.21 RC 2

merge viewer_1-21 94770-96059 -> release

1 files changed, 22 insertions, 0 deletions

diff --git a/indra/llcommon/llapr.cpp b/indra/llcommon/llapr.cpp
index e83473216a..697f380f98 100644
--- a/indra/llcommon/llapr.cpp
+++ b/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)