From d593f5c1d391d7406015e488d59c2b00beb7d8be Mon Sep 17 00:00:00 2001
From: Xiaohong Bao <bao@lindenlab.com>
Date: Wed, 23 Feb 2011 14:35:53 -0700
Subject: [PATCH] fix a merge error
---
indra/llcommon/llmemory.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/indra/llcommon/llmemory.cpp b/indra/llcommon/llmemory.cpp
index 08fc1ddfe58..1414ac7b9e1 100644
--- a/indra/llcommon/llmemory.cpp
+++ b/indra/llcommon/llmemory.cpp
@@ -1271,7 +1271,7 @@ LLPrivateMemoryPool::LLPrivateMemoryPool(U32 max_size, bool threaded) :
{
if(threaded)
{
- mMutexp = new LLMutex(NULL) ;
+ mMutexp = new LLMutex ;
}
for(S32 i = 0 ; i < SUPER_ALLOCATION ; i++)
--
GitLab