SH-4061 WIP - less log spamming for (expected and normal) map tile failures.

2 files changed, 28 insertions, 13 deletions

diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp
index 5a6338d9d8..58cfc80839 100755
--- a/indra/newview/lltexturefetch.cpp
+++ b/indra/newview/lltexturefetch.cpp
@@ -1526,14 +1526,20 @@ bool LLTextureFetchWorker::doWork(S32 param)
 			{
 				if (http_not_found == mGetStatus)
 				{
-					llwarns << "Texture missing from server (404): " << mUrl << llendl;
+					if (mFTType != FTT_MAP_TILE)
+					{
+						llwarns << "Texture missing from server (404): " << mUrl << llendl;
+					}
 
-					if(mWriteToCacheState == NOT_WRITE) //map tiles
+					if(mWriteToCacheState == NOT_WRITE) //map tiles or server bakes
 					{
 						setState(DONE);
 						releaseHttpSemaphore();
-						LL_WARNS("Texture") << mID << " abort: WAIT_HTTP_REQ not found" << llendl;
-						return true; // failed, means no map tile on the empty region.
+						if (mFTType != FTT_MAP_TILE)
+						{
+							LL_WARNS("Texture") << mID << " abort: WAIT_HTTP_REQ not found" << llendl;
+						}
+						return true; 
 					}
 
 
@@ -1925,8 +1931,11 @@ void LLTextureFetchWorker::onCompleted(LLCore::HttpHandle handle, LLCore::HttpRe
 	if (! status)
 	{
 		success = false;
-		llwarns << "CURL GET FAILED, status: " << status.toHex()
-				<< " reason: " << reason << llendl;
+		if (mFTType != FTT_MAP_TILE) // missing map tiles are normal, don't complain about them.
+		{
+			llwarns << "CURL GET FAILED, status: " << status.toHex()
+					<< " reason: " << reason << llendl;
+		}
 	}
 	else
 	{
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index 7a1afb1238..5f4c66a04c 100755
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -1828,8 +1828,11 @@ bool LLViewerFetchedTexture::updateFetch()
 				{
 					const S32 MAX_FETCH_FAILURE = 3;
 					mFetchFailureCount++;
-					llwarns << "Fetch failure for " << mID << " failure count " << mFetchFailureCount
-							<< " status " << mLastHttpGetStatus.toHex() << llendl;
+					if (getFTType() != FTT_MAP_TILE)
+					{
+						llwarns << "Fetch failure for " << mID << " failure count " << mFetchFailureCount
+								<< " status " << mLastHttpGetStatus.toHex() << llendl;
+					}
 					// Will retry server-bake textures under a limited set of circumstances.
 					if (getFTType() == FTT_SERVER_BAKE && 
 						mLastHttpGetStatus.isHttpStatus() && 
@@ -1841,11 +1844,14 @@ bool LLViewerFetchedTexture::updateFetch()
 					}
 					else // Otherwise, assume the image is missing.
 					{
-						llwarns << "!mIsFetching, setting as missing, decode_priority " << decode_priority
-								<< " mRawDiscardLevel " << mRawDiscardLevel
-								<< " current_discard " << current_discard
-								<< " stats " << mLastHttpGetStatus.toHex()
-								<< llendl;
+						if (getFTType() != FTT_MAP_TILE)
+						{
+							llwarns << "!mIsFetching, setting as missing, decode_priority " << decode_priority
+									<< " mRawDiscardLevel " << mRawDiscardLevel
+									<< " current_discard " << current_discard
+									<< " stats " << mLastHttpGetStatus.toHex()
+									<< llendl;
+						}
 						setIsMissingAsset();
 						desired_discard = -1;
 					}