diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-05-08 17:38:13 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-05-08 17:38:13 -0700 |
| commit | cd6044ed7a52e68e6050130ac2e9a637b8b7f339 (patch) | |
| tree | 2295f1b2afce6815aec4b80ff447d65de31a67b4 /indra/llmath | |
| parent | 22fc3409f4606459c6df219c343a002fc53a35cd (diff) | |
| parent | 42fa05bd4cd8d587af4c216faca5e8c010812c8b (diff) | |
Merge viewer-release 6.2.2
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 3b8f08e0c6..89cdb1c6b9 100644 --- a/indra/llmath/llvolumemgr.cpp +++ b/indra/llmath/llvolumemgr.cpp @@ -48,7 +48,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() @@ -214,7 +214,7 @@ void LLVolumeMgr::useMutex() { if (!mDataMutex) { - mDataMutex = new LLMutex(gAPRPoolp); + mDataMutex = new LLMutex(); } } |