From 6ce79a0f78f1efe9ac702cbfc1401716cc11fdd2 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Sat, 22 Mar 2008 19:15:01 +0000 Subject: * Downgrade 'texture not found' message to DEBUG and stop putting out 'already dispatched' message completely temporarily * I believe that if the Linden client has not started to receive a texture after 15 seconds, it re-requests it. * My hypothesis is that the texture packets are often still in the texture queue (esp. if the client has just cleared its cache), so another load of packets get added... * If this is the cause, resolution is going to be rather complicated. --- .../Environment/Modules/UserTextureDownloadService.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs b/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs index 6432537..4fdec65 100644 --- a/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs +++ b/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs @@ -122,7 +122,7 @@ namespace OpenSim.Region.Environment.Modules { if (MAX_ALLOWED_TEXTURE_REQUESTS + 1 == missingTextureRequestCounts[e.RequestedAssetID]) { - m_log.WarnFormat( + m_log.DebugFormat( "[USER TEXTURE DOWNLOAD SERVICE]: Dropping requests for notified missing texture {0} for {1} since we have received more than {2} requests", e.RequestedAssetID, m_client.AgentId, MAX_ALLOWED_TEXTURE_REQUESTS); } @@ -143,12 +143,12 @@ namespace OpenSim.Region.Environment.Modules if (dispatchedTextureRequestCounts[e.RequestedAssetID] > MAX_ALLOWED_TEXTURE_REQUESTS) { - if (MAX_ALLOWED_TEXTURE_REQUESTS + 1 == dispatchedTextureRequestCounts[e.RequestedAssetID]) - { - m_log.WarnFormat( - "[USER TEXTURE DOWNLOAD SERVICE]: Dropping requests for dispatched texture {0} for {1} since we have received more than {2} requests", - e.RequestedAssetID, m_client.AgentId, MAX_ALLOWED_TEXTURE_REQUESTS); - } +// if (MAX_ALLOWED_TEXTURE_REQUESTS + 1 == dispatchedTextureRequestCounts[e.RequestedAssetID]) +// { +// m_log.DebugFormat( +// "[USER TEXTURE DOWNLOAD SERVICE]: Dropping further requests for dispatched/queued texture {0} for {1} since we have received more than {2} requests", +// e.RequestedAssetID, m_client.AgentId, MAX_ALLOWED_TEXTURE_REQUESTS); +// } return; } -- cgit v1.1