diff options
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 40 |
1 files changed, 16 insertions, 24 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 56f8880..870ce3e 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -7262,34 +7262,26 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7262 | //handlerTextureRequest = null; | 7262 | //handlerTextureRequest = null; |
7263 | for (int i = 0; i < imageRequest.RequestImage.Length; i++) | 7263 | for (int i = 0; i < imageRequest.RequestImage.Length; i++) |
7264 | { | 7264 | { |
7265 | if (OnRequestTexture != null) | 7265 | TextureRequestArgs args = new TextureRequestArgs(); |
7266 | { | ||
7267 | TextureRequestArgs args = new TextureRequestArgs(); | ||
7268 | |||
7269 | RequestImagePacket.RequestImageBlock block = imageRequest.RequestImage[i]; | ||
7270 | |||
7271 | args.RequestedAssetID = block.Image; | ||
7272 | args.DiscardLevel = block.DiscardLevel; | ||
7273 | args.PacketNumber = block.Packet; | ||
7274 | args.Priority = block.DownloadPriority; | ||
7275 | args.requestSequence = imageRequest.Header.Sequence; | ||
7276 | 7266 | ||
7277 | // NOTE: This is not a built in part of the LLUDP protocol, but we double the | 7267 | RequestImagePacket.RequestImageBlock block = imageRequest.RequestImage[i]; |
7278 | // priority of avatar textures to get avatars rezzing in faster than the | ||
7279 | // surrounding scene | ||
7280 | if ((ImageType)block.Type == ImageType.Baked) | ||
7281 | args.Priority *= 2.0f; | ||
7282 | 7268 | ||
7283 | //handlerTextureRequest = OnRequestTexture; | 7269 | args.RequestedAssetID = block.Image; |
7270 | args.DiscardLevel = block.DiscardLevel; | ||
7271 | args.PacketNumber = block.Packet; | ||
7272 | args.Priority = block.DownloadPriority; | ||
7273 | args.requestSequence = imageRequest.Header.Sequence; | ||
7284 | 7274 | ||
7285 | //if (handlerTextureRequest != null) | 7275 | // NOTE: This is not a built in part of the LLUDP protocol, but we double the |
7286 | //OnRequestTexture(this, args); | 7276 | // priority of avatar textures to get avatars rezzing in faster than the |
7277 | // surrounding scene | ||
7278 | if ((ImageType)block.Type == ImageType.Baked) | ||
7279 | args.Priority *= 2.0f; | ||
7287 | 7280 | ||
7288 | // in the end, we null this, so we have to check if it's null | 7281 | // in the end, we null this, so we have to check if it's null |
7289 | if (m_imageManager != null) | 7282 | if (m_imageManager != null) |
7290 | { | 7283 | { |
7291 | m_imageManager.EnqueueReq(args); | 7284 | m_imageManager.EnqueueReq(args); |
7292 | } | ||
7293 | } | 7285 | } |
7294 | } | 7286 | } |
7295 | return true; | 7287 | return true; |