summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturefetch.cpp
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2012-08-13 12:09:04 -0400
committerMonty Brandenberg <monty@lindenlab.com>2012-08-13 12:09:04 -0400
commitf5e35cbc5362f6b83fcccabf6b22374ca6f08d42 (patch)
treede1746f9e607d05b535523a3179ece971edd61ba /indra/newview/lltexturefetch.cpp
parent0664cb1512481b9cd9f5ef4bc398c88416b246a9 (diff)
parent337976096530729a7d671df68907cd59a7986972 (diff)
Merge from viewer-development.
Diffstat (limited to 'indra/newview/lltexturefetch.cpp')
-rwxr-xr-x[-rw-r--r--]indra/newview/lltexturefetch.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp
index b5586d1250..efaeafbe78 100644..100755
--- a/indra/newview/lltexturefetch.cpp
+++ b/indra/newview/lltexturefetch.cpp
@@ -1471,6 +1471,12 @@ bool LLTextureFetchWorker::doWork(S32 param)
{
if (http_not_found == mGetStatus)
{
+ if(mWriteToCacheState == NOT_WRITE) //map tiles
+ {
+ mState = DONE;
+ return true; // failed, means no map tile on the empty region.
+ }
+
llwarns << "Texture missing from server (404): " << mUrl << llendl;
// roll back to try UDP