aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-03-22 19:15:01 +0000
committerJustin Clarke Casey2008-03-22 19:15:01 +0000
commit6ce79a0f78f1efe9ac702cbfc1401716cc11fdd2 (patch)
tree284a352290743690f3d4bf98844c92366705702d
parent* Reducing spam on console so we only notify once if we're dropping repeated ... (diff)
downloadopensim-SC-6ce79a0f78f1efe9ac702cbfc1401716cc11fdd2.zip
opensim-SC-6ce79a0f78f1efe9ac702cbfc1401716cc11fdd2.tar.gz
opensim-SC-6ce79a0f78f1efe9ac702cbfc1401716cc11fdd2.tar.bz2
opensim-SC-6ce79a0f78f1efe9ac702cbfc1401716cc11fdd2.tar.xz
* 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.
-rw-r--r--OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs14
1 files 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
122 { 122 {
123 if (MAX_ALLOWED_TEXTURE_REQUESTS + 1 == missingTextureRequestCounts[e.RequestedAssetID]) 123 if (MAX_ALLOWED_TEXTURE_REQUESTS + 1 == missingTextureRequestCounts[e.RequestedAssetID])
124 { 124 {
125 m_log.WarnFormat( 125 m_log.DebugFormat(
126 "[USER TEXTURE DOWNLOAD SERVICE]: Dropping requests for notified missing texture {0} for {1} since we have received more than {2} requests", 126 "[USER TEXTURE DOWNLOAD SERVICE]: Dropping requests for notified missing texture {0} for {1} since we have received more than {2} requests",
127 e.RequestedAssetID, m_client.AgentId, MAX_ALLOWED_TEXTURE_REQUESTS); 127 e.RequestedAssetID, m_client.AgentId, MAX_ALLOWED_TEXTURE_REQUESTS);
128 } 128 }
@@ -143,12 +143,12 @@ namespace OpenSim.Region.Environment.Modules
143 143
144 if (dispatchedTextureRequestCounts[e.RequestedAssetID] > MAX_ALLOWED_TEXTURE_REQUESTS) 144 if (dispatchedTextureRequestCounts[e.RequestedAssetID] > MAX_ALLOWED_TEXTURE_REQUESTS)
145 { 145 {
146 if (MAX_ALLOWED_TEXTURE_REQUESTS + 1 == dispatchedTextureRequestCounts[e.RequestedAssetID]) 146// if (MAX_ALLOWED_TEXTURE_REQUESTS + 1 == dispatchedTextureRequestCounts[e.RequestedAssetID])
147 { 147// {
148 m_log.WarnFormat( 148// m_log.DebugFormat(
149 "[USER TEXTURE DOWNLOAD SERVICE]: Dropping requests for dispatched texture {0} for {1} since we have received more than {2} requests", 149// "[USER TEXTURE DOWNLOAD SERVICE]: Dropping further requests for dispatched/queued texture {0} for {1} since we have received more than {2} requests",
150 e.RequestedAssetID, m_client.AgentId, MAX_ALLOWED_TEXTURE_REQUESTS); 150// e.RequestedAssetID, m_client.AgentId, MAX_ALLOWED_TEXTURE_REQUESTS);
151 } 151// }
152 152
153 return; 153 return;
154 } 154 }