summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexture.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2013-04-08 13:26:05 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2013-04-08 13:26:05 -0400
commite16435c37cb7410f3ea4596e30fd232ac558bc71 (patch)
tree61f43145dd787095ad986b2da9b008d516e40a0b /indra/newview/llviewertexture.cpp
parent0a6a5f63b45bf3d97c7926b8d415b0b3885f64a1 (diff)
SH-4061 WIP - added ability to un-set missing asset, do this in the case of FTT_SERVER_BAKE images. This is needed because 'missing' is not necessarily permanent for such images.
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
-rwxr-xr-xindra/newview/llviewertexture.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index 500a6c8869..9cca8a244e 100755
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -2005,8 +2005,12 @@ void LLViewerFetchedTexture::forceToDeleteRequest()
mDesiredDiscardLevel = getMaxDiscardLevel() + 1;
}
-void LLViewerFetchedTexture::setIsMissingAsset(bool is_missing)
+void LLViewerFetchedTexture::setIsMissingAsset(BOOL is_missing)
{
+ if (is_missing == mIsMissingAsset)
+ {
+ return;
+ }
if (is_missing)
{
if (mUrl.empty())