diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-02-23 13:48:35 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-02-23 13:48:35 -0700 |
| commit | 29415d140777a25704ac06973c6cf467c30c994b (patch) | |
| tree | 8ea879ff5b839b2894e332ed72ff9702784949a0 /indra/llmath/llvolumemgr.cpp | |
| parent | 1f0cc074823b299ed77b3d6e90e4e8f4ea60415f (diff) | |
| parent | ef490e308ccce8e6df85144784a0f4580f5ac6a1 (diff) | |
Merge
Diffstat (limited to 'indra/llmath/llvolumemgr.cpp')
| -rw-r--r-- | indra/llmath/llvolumemgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmath/llvolumemgr.cpp b/indra/llmath/llvolumemgr.cpp index 88c195936c..734440d312 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; } } |