diff options
| author | Jacek Antonelli | 2009-01-28 20:05:14 -0600 |
|---|---|---|
| committer | Jacek Antonelli | 2009-01-28 20:05:15 -0600 |
| commit | 715d7e4fe7c4dc7e71433211de3603bbc5753922 (patch) | |
| tree | 921761667c9a7c108b6513b0fffb16cd9a0a1a22 /linden/indra/newview/lltexturefetch.cpp | |
| parent | Second Life viewer sources 1.22.6-RC (diff) | |
| download | meta-impy-715d7e4fe7c4dc7e71433211de3603bbc5753922.zip meta-impy-715d7e4fe7c4dc7e71433211de3603bbc5753922.tar.gz meta-impy-715d7e4fe7c4dc7e71433211de3603bbc5753922.tar.bz2 meta-impy-715d7e4fe7c4dc7e71433211de3603bbc5753922.tar.xz | |
Second Life viewer sources 1.22.7-RC
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 | { |