diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-02-23 14:35:53 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-02-23 14:35:53 -0700 |
| commit | d593f5c1d391d7406015e488d59c2b00beb7d8be (patch) | |
| tree | 8cfac70dee28cdd9df3e6eb3466b093708b39c77 | |
| parent | 29415d140777a25704ac06973c6cf467c30c994b (diff) | |
fix a merge error
| -rw-r--r-- | indra/llcommon/llmemory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llmemory.cpp b/indra/llcommon/llmemory.cpp index 08fc1ddfe5..1414ac7b9e 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++) |