diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/lltexturefetch.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/linden/indra/newview/lltexturefetch.cpp b/linden/indra/newview/lltexturefetch.cpp index a7c43ce..24046cc 100644 --- a/linden/indra/newview/lltexturefetch.cpp +++ b/linden/indra/newview/lltexturefetch.cpp | |||
@@ -1240,7 +1240,12 @@ void LLTextureFetchWorker::callbackDecoded(bool success) | |||
1240 | 1240 | ||
1241 | bool LLTextureFetchWorker::decodeImage() | 1241 | bool LLTextureFetchWorker::decodeImage() |
1242 | { | 1242 | { |
1243 | llassert_always(mImageWorker); | 1243 | if(!mImageWorker) |
1244 | { | ||
1245 | //LLTextureFetchWorker is aborted, skip image decoding. | ||
1246 | return true ; | ||
1247 | } | ||
1248 | |||
1244 | bool res = true; | 1249 | bool res = true; |
1245 | if (mRawImage.isNull()) | 1250 | if (mRawImage.isNull()) |
1246 | { | 1251 | { |