diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-05-08 00:09:53 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-05-08 00:09:53 +0300 |
| commit | aefb0503aa199c6dfd383fe7b23cd129960dc1be (patch) | |
| tree | b47e51ddb4d20799897377345334bb3f925ac4d6 /indra/llimage | |
| parent | 964afabae667c55ccb2d7051e6a6793773b025e0 (diff) | |
| parent | 34322f8f37380df868703051230f2a4109602b3f (diff) | |
Merged in lindenlab/viewer-release
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 |