diff options
| author | David Seikel | 2011-04-26 21:30:21 +1000 |
|---|---|---|
| committer | David Seikel | 2011-04-26 21:30:21 +1000 |
| commit | da97e24c3b045d16589124496d032ffb9b4ca07f (patch) | |
| tree | 34d84cf4355f83e1a106d06a10ed2a4bb121fdc4 /linden/indra/llimage | |
| parent | Apparently there is a wrong client tag for firestorm out in the wild. (diff) | |
| parent | Changed version to Experimental 2011.04.19 (diff) | |
| download | meta-impy-da97e24c3b045d16589124496d032ffb9b4ca07f.zip meta-impy-da97e24c3b045d16589124496d032ffb9b4ca07f.tar.gz meta-impy-da97e24c3b045d16589124496d032ffb9b4ca07f.tar.bz2 meta-impy-da97e24c3b045d16589124496d032ffb9b4ca07f.tar.xz | |
Merge remote-tracking branch 'imprudence/exp' into exp
Conflicts (for future reference):
linden/indra/llcommon/llstring.cpp
linden/indra/newview/llpanelnetwork.cpp
linden/indra/newview/llselectmgr.cpp
linden/indra/newview/llstartup.cpp
linden/indra/newview/lltoolmgr.cpp
linden/indra/newview/llvoavatar.cpp
Diffstat (limited to 'linden/indra/llimage')
| -rw-r--r-- | linden/indra/llimage/llimageworker.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/llimage/llimageworker.cpp b/linden/indra/llimage/llimageworker.cpp index dc989e5..5e61f69 100644 --- a/linden/indra/llimage/llimageworker.cpp +++ b/linden/indra/llimage/llimageworker.cpp | |||
| @@ -164,7 +164,7 @@ void LLImageDecodeThread::ImageRequest::finishRequest(bool completed) | |||
| 164 | { | 164 | { |
| 165 | if (mResponder.notNull()) | 165 | if (mResponder.notNull()) |
| 166 | { | 166 | { |
| 167 | bool success = completed && mDecodedRaw && (!mNeedsAux || mDecodedAux); | 167 | bool success = completed && mDecodedRaw && mDecodedImageRaw->getDataSize() && (!mNeedsAux || mDecodedAux); |
| 168 | mResponder->completed(success, mDecodedImageRaw, mDecodedImageAux); | 168 | mResponder->completed(success, mDecodedImageRaw, mDecodedImageAux); |
| 169 | } | 169 | } |
| 170 | // Will automatically be deleted | 170 | // Will automatically be deleted |