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 | |
| parent | d1c056beba8c3558756eac816e26a388a512e0ee (diff) | |
| parent | d99e867284f4d908e9ee86544726c66719e11e3f (diff) | |
Automated merge with ssh://hg.lindenlab.com/simon/viewmaster
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/lltexturefetch.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/llviewertexture.cpp | 3 |
2 files changed, 8 insertions, 1 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; diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 7f638a24bf..e1eb54bd24 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -2182,7 +2182,8 @@ void LLViewerFetchedTexture::setIsMissingAsset() } else { - llwarns << mUrl << ": Marking image as missing" << llendl; + //it is normal no map tile on an empty region. + //llwarns << mUrl << ": Marking image as missing" << llendl; } if (mHasFetcher) { |