diff options
author | Homer Horwitz | 2008-11-17 22:15:02 +0000 |
---|---|---|
committer | Homer Horwitz | 2008-11-17 22:15:02 +0000 |
commit | 5972eb8848ecd1033e987706e404abdc79bfa5e6 (patch) | |
tree | 3bc47d86c3093e2a4c34d24e8d61cd9db0092212 /OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs | |
parent | Set group on newly rezzed objects to the rezzer's (or rezzing object's) (diff) | |
download | opensim-SC_OLD-5972eb8848ecd1033e987706e404abdc79bfa5e6.zip opensim-SC_OLD-5972eb8848ecd1033e987706e404abdc79bfa5e6.tar.gz opensim-SC_OLD-5972eb8848ecd1033e987706e404abdc79bfa5e6.tar.bz2 opensim-SC_OLD-5972eb8848ecd1033e987706e404abdc79bfa5e6.tar.xz |
Fix a few small issues with the progressive texture-download:
- The initial priority wasn't passed in, so a discardLevel of -1 in the first
request automatically cancelled texture-download.
- One-packet textures weren't handled, as CurrentPacket starts at 1 and
StopPacket == 0 in that case.
- Increased MAX_ALLOWED_TEXTURE_REQUESTS to 15; incremental texture downloads
will cause more requests.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs index 715dc4b..bcae259 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs +++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs | |||
@@ -57,11 +57,10 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
57 | /// <summary> | 57 | /// <summary> |
58 | /// We will allow the client to request the same texture n times before dropping further requests | 58 | /// We will allow the client to request the same texture n times before dropping further requests |
59 | /// | 59 | /// |
60 | /// This number includes repeated requests for the same texture at different resolutions (which we don't | 60 | /// This number contains repeated requests for the same texture at different resolutions (which |
61 | /// currently handle properly as far as I know). However, this situation should be handled in a more | 61 | /// are handled since r7368). However, this situation should be handled in a more sophisticated way. |
62 | /// sophisticated way. | ||
63 | /// </summary> | 62 | /// </summary> |
64 | private static readonly int MAX_ALLOWED_TEXTURE_REQUESTS = 5; | 63 | private static readonly int MAX_ALLOWED_TEXTURE_REQUESTS = 15; |
65 | 64 | ||
66 | /// <summary> | 65 | /// <summary> |
67 | /// XXX Also going to limit requests for found textures. | 66 | /// XXX Also going to limit requests for found textures. |
@@ -150,7 +149,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
150 | 149 | ||
151 | m_scene.AddPendingDownloads(1); | 150 | m_scene.AddPendingDownloads(1); |
152 | 151 | ||
153 | TextureSender.TextureSender requestHandler = new TextureSender.TextureSender(m_client, e.DiscardLevel, e.PacketNumber); | 152 | TextureSender.TextureSender requestHandler = new TextureSender.TextureSender(m_client, e.DiscardLevel, e.PacketNumber, e.Priority); |
154 | m_textureSenders.Add(e.RequestedAssetID, requestHandler); | 153 | m_textureSenders.Add(e.RequestedAssetID, requestHandler); |
155 | 154 | ||
156 | m_scene.AssetCache.GetAsset(e.RequestedAssetID, TextureCallback, true); | 155 | m_scene.AssetCache.GetAsset(e.RequestedAssetID, TextureCallback, true); |