From fc1d2097cd60691fcb9b73d7ca03e3127f43b1fd Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Mon, 12 Jun 2017 20:17:55 +0300 Subject: [PATCH] MAINT-7325 Fixed empty cached image being used instead of fetching --- indra/newview/llviewertexture.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 412cd5e7ff..9ce836ec23 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -2227,7 +2227,9 @@ bool LLViewerFetchedTexture::updateFetch() { make_request = false; } - else if(mCachedRawImage.notNull() && (current_discard < 0 || current_discard > mCachedRawDiscardLevel)) + else if(mCachedRawImage.notNull() // can be empty + && mCachedRawImageReady + && (current_discard < 0 || current_discard > mCachedRawDiscardLevel)) { make_request = false; switchToCachedImage(); //use the cached raw data first