summaryrefslogtreecommitdiff
path: root/indra/llcommon/llmemory.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-10-17 16:19:57 -0400
committerOz Linden <oz@lindenlab.com>2011-10-17 16:19:57 -0400
commit77dc594e79118769087c0e2094c303fc5aaea5d4 (patch)
treeed538b0b4e1d0b1de7ecbf22f701bbb1595b967c /indra/llcommon/llmemory.cpp
parent94c137d5c970bc01e3a4dbe8de6a7104085e5ba6 (diff)
parent1afbdc79c6fb911a5ab2c87067e7b99bec92fbc6 (diff)
merge back late changes and tags from release branch
Diffstat (limited to 'indra/llcommon/llmemory.cpp')
-rw-r--r--indra/llcommon/llmemory.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llmemory.cpp b/indra/llcommon/llmemory.cpp
index 3b27a1639a..3c5c20d0bf 100644
--- a/indra/llcommon/llmemory.cpp
+++ b/indra/llcommon/llmemory.cpp
@@ -1325,7 +1325,7 @@ LLPrivateMemoryPool::LLPrivateMemoryPool(S32 type, U32 max_pool_size) :
{
if(type == STATIC_THREADED || type == VOLATILE_THREADED)
{
- mMutexp = new LLMutex ;
+ mMutexp = new LLMutex(NULL) ;
}
for(S32 i = 0 ; i < SUPER_ALLOCATION ; i++)