Applied patch by Thickbrick Sleaford for SNOW-698: Crash when http-getting an empty texture: ERROR: doWork: ASSERT (mFormattedImage->getDataSize() > 0)

1 files changed, 11 insertions, 3 deletions

diff --git a/linden/indra/newview/lltexturefetch.cpp b/linden/indra/newview/lltexturefetch.cpp
index ebb0ee4..326a1b6 100644
--- a/linden/indra/newview/lltexturefetch.cpp
+++ b/linden/indra/newview/lltexturefetch.cpp
@@ -1224,14 +1224,22 @@ void LLTextureFetchWorker::callbackHttpGet(const LLChannelDescriptors& channels,
                                 mFormattedImage = NULL; // discard any previous data we had
                                 mBufferSize = data_size;
                         }
+                        mRequestedSize = data_size;
                 }
                 else
                 {
                         // We requested data but received none (and no error),
-                        // so presumably we have all of it
-                        mHaveAllData = TRUE;
+                        if (mFormattedImage.notNull() && mFormattedImage->getDataSize() > 0)
+                        {
+                                // but have earlier data, so presumably we have it all.
+                                mRequestedSize = 0;
+                                mHaveAllData = TRUE;
+                        }
+                        else
+                        {
+                                mRequestedSize = -1;    // treat this fetch as if it failed.
+                        }
                 }
-                mRequestedSize = data_size;
         }
         else
         {