diff options
author | Dahlia Trimble | 2009-01-10 09:15:23 +0000 |
---|---|---|
committer | Dahlia Trimble | 2009-01-10 09:15:23 +0000 |
commit | 630ce5b26446883043aa5e6541a4550d0e918659 (patch) | |
tree | 5128485b0d8e94c96593b352a421623cbd053acb /OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs | |
parent | Include the changes from StrawBerryFride's patch to (diff) | |
download | opensim-SC_OLD-630ce5b26446883043aa5e6541a4550d0e918659.zip opensim-SC_OLD-630ce5b26446883043aa5e6541a4550d0e918659.tar.gz opensim-SC_OLD-630ce5b26446883043aa5e6541a4550d0e918659.tar.bz2 opensim-SC_OLD-630ce5b26446883043aa5e6541a4550d0e918659.tar.xz |
Revert progressive texture patch from r8001 until issues can be addressed
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs index aab4ad0..e0790a2 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs +++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs | |||
@@ -56,10 +56,11 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
56 | /// <summary> | 56 | /// <summary> |
57 | /// We will allow the client to request the same texture n times before dropping further requests | 57 | /// We will allow the client to request the same texture n times before dropping further requests |
58 | /// | 58 | /// |
59 | /// This number contains repeated requests for the same texture at different resolutions (which | 59 | /// This number includes repeated requests for the same texture at different resolutions (which we don't |
60 | /// are handled since r7368). However, this situation should be handled in a more sophisticated way. | 60 | /// currently handle properly as far as I know). However, this situation should be handled in a more |
61 | /// sophisticated way. | ||
61 | /// </summary> | 62 | /// </summary> |
62 | private static readonly int MAX_ALLOWED_TEXTURE_REQUESTS = 15; | 63 | private static readonly int MAX_ALLOWED_TEXTURE_REQUESTS = 5; |
63 | 64 | ||
64 | /// <summary> | 65 | /// <summary> |
65 | /// XXX Also going to limit requests for found textures. | 66 | /// XXX Also going to limit requests for found textures. |
@@ -119,13 +120,13 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
119 | } | 120 | } |
120 | else | 121 | else |
121 | { | 122 | { |
122 | // m_log.DebugFormat("[TEXTURE]: Received a request for texture {0}", e.RequestedAssetID); | 123 | // m_log.DebugFormat("[TEXTURE]: Received a request for texture {0}", e.RequestedAssetID); |
123 | 124 | ||
124 | if (!foundTextureLimitStrategy.AllowRequest(e.RequestedAssetID)) | 125 | if (!foundTextureLimitStrategy.AllowRequest(e.RequestedAssetID)) |
125 | { | 126 | { |
126 | // m_log.DebugFormat( | 127 | // m_log.DebugFormat( |
127 | // "[TEXTURE]: Refusing request for {0} from client {1}", | 128 | // "[TEXTURE]: Refusing request for {0} from client {1}", |
128 | // e.RequestedAssetID, m_client.AgentId); | 129 | // e.RequestedAssetID, m_client.AgentId); |
129 | 130 | ||
130 | return; | 131 | return; |
131 | } | 132 | } |
@@ -138,9 +139,9 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
138 | 139 | ||
139 | // Commenting out this message for now as it causes too much noise with other | 140 | // Commenting out this message for now as it causes too much noise with other |
140 | // debug messages. | 141 | // debug messages. |
141 | // m_log.DebugFormat( | 142 | // m_log.DebugFormat( |
142 | // "[TEXTURE]: Dropping requests for notified missing texture {0} for client {1} since we have received more than {2} requests", | 143 | // "[TEXTURE]: Dropping requests for notified missing texture {0} for client {1} since we have received more than {2} requests", |
143 | // e.RequestedAssetID, m_client.AgentId, MAX_ALLOWED_TEXTURE_REQUESTS); | 144 | // e.RequestedAssetID, m_client.AgentId, MAX_ALLOWED_TEXTURE_REQUESTS); |
144 | } | 145 | } |
145 | 146 | ||
146 | return; | 147 | return; |
@@ -148,7 +149,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
148 | 149 | ||
149 | m_scene.AddPendingDownloads(1); | 150 | m_scene.AddPendingDownloads(1); |
150 | 151 | ||
151 | TextureSender.TextureSender requestHandler = new TextureSender.TextureSender(m_client, e.DiscardLevel, e.PacketNumber, e.Priority); | 152 | TextureSender.TextureSender requestHandler = new TextureSender.TextureSender(m_client, e.DiscardLevel, e.PacketNumber); |
152 | m_textureSenders.Add(e.RequestedAssetID, requestHandler); | 153 | m_textureSenders.Add(e.RequestedAssetID, requestHandler); |
153 | 154 | ||
154 | m_scene.AssetCache.GetAsset(e.RequestedAssetID, TextureCallback, true); | 155 | m_scene.AssetCache.GetAsset(e.RequestedAssetID, TextureCallback, true); |
@@ -195,9 +196,9 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
195 | { | 196 | { |
196 | missingTextureLimitStrategy.MonitorRequests(textureID); | 197 | missingTextureLimitStrategy.MonitorRequests(textureID); |
197 | 198 | ||
198 | // m_log.DebugFormat( | 199 | // m_log.DebugFormat( |
199 | // "[TEXTURE]: Queueing first TextureNotFoundSender for {0}, client {1}", | 200 | // "[TEXTURE]: Queueing first TextureNotFoundSender for {0}, client {1}", |
200 | // textureID, m_client.AgentId); | 201 | // textureID, m_client.AgentId); |
201 | } | 202 | } |
202 | 203 | ||
203 | ITextureSender textureNotFoundSender = new TextureNotFoundSender(m_client, textureID); | 204 | ITextureSender textureNotFoundSender = new TextureNotFoundSender(m_client, textureID); |