diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-09-02 13:48:29 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-09-02 13:48:29 -0400 |
| commit | 0ab6eee0996c78d32b722157140cea5a21a5e460 (patch) | |
| tree | 2a0e90651e3cb0e236c9091b33c64d2cb7a616f7 /indra/llmath | |
| parent | fcc51bd5b01f2a383ad057898484ac9938219b11 (diff) | |
| parent | 8efd992d508eecec42648af4a7bb980fc0cc19cc (diff) | |
merge changes for storm-1027
Diffstat (limited to 'indra/llmath')
| -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 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; } } |