summaryrefslogtreecommitdiff
path: root/indra/llmath
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2011-08-31 10:48:56 -0600
committerXiaohong Bao <bao@lindenlab.com>2011-08-31 10:48:56 -0600
commit749d9ebadcd201e27a9453de7a2d9320d78efbb5 (patch)
tree6e2119ba44dd37543a81c2b67644c5fa1ac2b698 /indra/llmath
parentbdd053abcffea1f4c30421176d0a3749027c6b7d (diff)
parent48d949150cd445ce1e801a7a8ee67597a965f14b (diff)
Merge
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 c60b750088..42180197fe 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(gAPRPoolp);
+ //mDataMutex = new LLMutex;
}
LLVolumeMgr::~LLVolumeMgr()
@@ -216,7 +216,7 @@ void LLVolumeMgr::useMutex()
{
if (!mDataMutex)
{
- mDataMutex = new LLMutex(gAPRPoolp);
+ mDataMutex = new LLMutex;
}
}