summaryrefslogtreecommitdiff
path: root/indra/llmath
diff options
context:
space:
mode:
authorniel@nirvana-win7hp.planescape.home <niel@nirvana-win7hp.planescape.home>2011-10-26 01:42:26 +0100
committerniel@nirvana-win7hp.planescape.home <niel@nirvana-win7hp.planescape.home>2011-10-26 01:42:26 +0100
commit4fd9a53115bf85ffe17974323d5fa609e0df960c (patch)
tree7968008d0fa7c0347d637e1fb19add9d436b926d /indra/llmath
parent42c166e451d362609d83fb17261f9e8f344e974d (diff)
parentb7a349f231977d5917b29faacca143a85d925576 (diff)
Merge STORM-959
Diffstat (limited to 'indra/llmath')
-rw-r--r--indra/llmath/llvolumemgr.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmath/llvolumemgr.cpp b/indra/llmath/llvolumemgr.cpp
index 42180197fe..c60b750088 100644
--- a/indra/llmath/llvolumemgr.cpp
+++ b/indra/llmath/llvolumemgr.cpp
@@ -49,7 +49,7 @@ LLVolumeMgr::LLVolumeMgr()
{
// the LLMutex magic interferes with easy unit testing,
// so you now must manually call useMutex() to use it
- //mDataMutex = new LLMutex;
+ //mDataMutex = new LLMutex(gAPRPoolp);
}
LLVolumeMgr::~LLVolumeMgr()
@@ -216,7 +216,7 @@ void LLVolumeMgr::useMutex()
{
if (!mDataMutex)
{
- mDataMutex = new LLMutex;
+ mDataMutex = new LLMutex(gAPRPoolp);
}
}