diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2012-07-06 16:37:45 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2012-07-06 16:37:45 -0600 |
| commit | e5d2ddc4843c5ecee4a735bd409b41cbf0d438eb (patch) | |
| tree | a11f13b3e0ff5d3be1445cf0f0d68c5607f54871 /indra/newview/lltexturefetch.cpp | |
| parent | d1c056beba8c3558756eac816e26a388a512e0ee (diff) | |
| parent | d99e867284f4d908e9ee86544726c66719e11e3f (diff) | |
Automated merge with ssh://hg.lindenlab.com/simon/viewmaster
Diffstat (limited to 'indra/newview/lltexturefetch.cpp')
| -rwxr-xr-x | indra/newview/lltexturefetch.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index 7e6dfbc9d9..2ed7488b85 100755 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -1249,6 +1249,12 @@ bool LLTextureFetchWorker::doWork(S32 param) S32 max_attempts; if (mGetStatus == HTTP_NOT_FOUND) { + if(mWriteToCacheState == NOT_WRITE) //map tiles + { + mState = DONE; + return true; // failed, means no map tile on the empty region. + } + mHTTPFailCount = max_attempts = 1; // Don't retry llwarns << "Texture missing from server (404): " << mUrl << llendl; |