diff options
author | Richard Linden <none@none> | 2014-02-24 18:45:59 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2014-02-24 18:45:59 -0800 |
commit | 80b4a4a1f54dccb814b5486423bf6492b3ae58a7 (patch) | |
tree | f17c7a9b433e443b2f30251dd15b1bf50d4f803c /indra/llimage/llimageworker.cpp | |
parent | de8fea13627cc5978b8a6135802a52864a11c39a (diff) | |
parent | ef591d280eb3c5bae7da20540ad4cbb30858d0aa (diff) |
merge with release
Diffstat (limited to 'indra/llimage/llimageworker.cpp')
-rwxr-xr-x | indra/llimage/llimageworker.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llimage/llimageworker.cpp b/indra/llimage/llimageworker.cpp index ad2eb0f69c..c8b0e872f6 100755 --- a/indra/llimage/llimageworker.cpp +++ b/indra/llimage/llimageworker.cpp @@ -60,7 +60,7 @@ S32 LLImageDecodeThread::update(F32 max_time_ms) bool res = addRequest(req); if (!res) { - llerrs << "request added after LLLFSThread::cleanupClass()" << llendl; + LL_ERRS() << "request added after LLLFSThread::cleanupClass()" << LL_ENDL; } } mCreationList.clear(); |