summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorWilliam Todd Stinson <stinson@lindenlab.com>2012-10-11 18:25:13 -0700
committerWilliam Todd Stinson <stinson@lindenlab.com>2012-10-11 18:25:13 -0700
commite1bc3cb096414493203763301314566709cff8bd (patch)
tree173d600295cf93dcd5fb136f874cc5d977b6318d /indra
parent572d4bc071578edb62a71d787a4c20124b755f16 (diff)
MAINT-1684: Correcting the calls to ll_aligned_free() which should have actually been to ll_aligned_free_16().
Diffstat (limited to 'indra')
-rw-r--r--indra/llcommon/llmemory.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/llmemory.cpp b/indra/llcommon/llmemory.cpp
index eaa7b58e08..70ad10ad55 100644
--- a/indra/llcommon/llmemory.cpp
+++ b/indra/llcommon/llmemory.cpp
@@ -1426,7 +1426,7 @@ void LLPrivateMemoryPool::freeMem(void* addr)
if(!chunk)
{
- ll_aligned_free(addr) ; //release from heap
+ ll_aligned_free_16(addr) ; //release from heap
}
else
{
@@ -1618,7 +1618,7 @@ void LLPrivateMemoryPool::removeChunk(LLMemoryChunk* chunk)
mReservedPoolSize -= chunk->getBufferSize() ;
//release memory
- ll_aligned_free(chunk->getBuffer()) ;
+ ll_aligned_free_16(chunk->getBuffer()) ;
}
U16 LLPrivateMemoryPool::findHashKey(const char* addr)
@@ -2016,7 +2016,7 @@ void LLPrivateMemoryPoolManager::freeMem(LLPrivateMemoryPool* poolp, void* addr
{
if(!sPrivatePoolEnabled)
{
- ll_aligned_free(addr) ; //private pool is disabled.
+ ll_aligned_free_16(addr) ; //private pool is disabled.
}
else if(!sInstance) //the private memory manager is destroyed, try the dangling list
{