summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2017-06-12 20:17:55 +0300
committerandreykproductengine <andreykproductengine@lindenlab.com>2017-06-12 20:17:55 +0300
commit515db9c3e6acf30d0adb58868ac0acfe684c4166 (patch)
tree7a7b8066189a703b32eabbf64d9f9221bf492d6d
parent52a964376b6aabd1abadfb7329004c2e58b7b97a (diff)
MAINT-7325 Fixed empty cached image being used instead of fetching
-rw-r--r--indra/newview/llviewertexture.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index c162af371f..cd8dd54fa6 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -2089,7 +2089,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