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/llimage | |
parent | 22fc3409f4606459c6df219c343a002fc53a35cd (diff) | |
parent | 42fa05bd4cd8d587af4c216faca5e8c010812c8b (diff) |
Merge viewer-release 6.2.2
Diffstat (limited to 'indra/llimage')
-rw-r--r-- | indra/llimage/llimage.cpp | 2 | ||||
-rw-r--r-- | indra/llimage/llimageworker.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp index 1a4dd2ca99..680fbf548f 100644 --- a/indra/llimage/llimage.cpp +++ b/indra/llimage/llimage.cpp @@ -594,7 +594,7 @@ void LLImage::initClass(bool use_new_byte_range, S32 minimal_reverse_byte_range_ { sUseNewByteRange = use_new_byte_range; sMinimalReverseByteRangePercent = minimal_reverse_byte_range_percent; - sMutex = new LLMutex(NULL); + sMutex = new LLMutex(); } //static diff --git a/indra/llimage/llimageworker.cpp b/indra/llimage/llimageworker.cpp index 4875fe7001..5f42fba866 100644 --- a/indra/llimage/llimageworker.cpp +++ b/indra/llimage/llimageworker.cpp @@ -35,7 +35,7 @@ LLImageDecodeThread::LLImageDecodeThread(bool threaded) : LLQueuedThread("imagedecode", threaded) { - mCreationMutex = new LLMutex(getAPRPool()); + mCreationMutex = new LLMutex(); } //virtual |