summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorSteve Bennetts <steve@lindenlab.com>2009-12-15 14:44:41 -0800
committerSteve Bennetts <steve@lindenlab.com>2009-12-15 14:44:41 -0800
commit710d2a6db367e0bc57b098f8ceced68b533674de (patch)
tree5485e57a473a0551e25d0816169f1d4a12b132c8 /indra/newview
parent870d4449f5eec1c2a7e5e4627a0433846ab256aa (diff)
Fixed an edge case that was triggering an error check when doing HTTP texture fetches.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/lltexturefetch.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp
index 85259fdc1e..9f69ed3964 100644
--- a/indra/newview/lltexturefetch.cpp
+++ b/indra/newview/lltexturefetch.cpp
@@ -887,6 +887,8 @@ bool LLTextureFetchWorker::doWork(S32 param)
}
else
{
+ // mFormattedImage gauranteed to not be NULL since cur_size != 0
+ mLoadedDiscard = mFormattedImage->getDiscardLevel();
mState = DECODE_IMAGE;
return false; // use what we have
}