Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into 2024.09-ExtraFPS

1 files changed, 6 insertions, 1 deletions

diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index 4a15b8624a..d2511aef7b 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -1965,7 +1965,9 @@ bool LLViewerFetchedTexture::updateFetch()
 
         if (!mIsFetching)
         {
-            if ((decode_priority > 0) && (mRawDiscardLevel < 0 || mRawDiscardLevel == INVALID_DISCARD_LEVEL))
+            if ((decode_priority > 0)
+                && (mRawDiscardLevel < 0 || mRawDiscardLevel == INVALID_DISCARD_LEVEL)
+                && mFetchState > 1) // 1 - initial, make sure fetcher did at least something
             {
                 // We finished but received no data
                 if (getDiscardLevel() < 0)
@@ -2003,6 +2005,9 @@ bool LLViewerFetchedTexture::updateFetch()
             {
                 // We have data, but our fetch failed to return raw data
                 // *TODO: FIgure out why this is happening and fix it
+                // Potentially can happen when TEX_LIST_SCALE and TEX_LIST_STANDARD
+                // get requested for the same texture id at the same time
+                // (two textures, one fetcher)
                 destroyRawImage();
             }
         }