aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs40
1 files changed, 16 insertions, 24 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index f27a6eb..d63b719 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -7195,34 +7195,26 @@ namespace OpenSim.Region.ClientStack.LindenUDP
7195 //handlerTextureRequest = null; 7195 //handlerTextureRequest = null;
7196 for (int i = 0; i < imageRequest.RequestImage.Length; i++) 7196 for (int i = 0; i < imageRequest.RequestImage.Length; i++)
7197 { 7197 {
7198 if (OnRequestTexture != null) 7198 TextureRequestArgs args = new TextureRequestArgs();
7199 {
7200 TextureRequestArgs args = new TextureRequestArgs();
7201
7202 RequestImagePacket.RequestImageBlock block = imageRequest.RequestImage[i];
7203
7204 args.RequestedAssetID = block.Image;
7205 args.DiscardLevel = block.DiscardLevel;
7206 args.PacketNumber = block.Packet;
7207 args.Priority = block.DownloadPriority;
7208 args.requestSequence = imageRequest.Header.Sequence;
7209 7199
7210 // NOTE: This is not a built in part of the LLUDP protocol, but we double the 7200 RequestImagePacket.RequestImageBlock block = imageRequest.RequestImage[i];
7211 // priority of avatar textures to get avatars rezzing in faster than the
7212 // surrounding scene
7213 if ((ImageType)block.Type == ImageType.Baked)
7214 args.Priority *= 2.0f;
7215 7201
7216 //handlerTextureRequest = OnRequestTexture; 7202 args.RequestedAssetID = block.Image;
7203 args.DiscardLevel = block.DiscardLevel;
7204 args.PacketNumber = block.Packet;
7205 args.Priority = block.DownloadPriority;
7206 args.requestSequence = imageRequest.Header.Sequence;
7217 7207
7218 //if (handlerTextureRequest != null) 7208 // NOTE: This is not a built in part of the LLUDP protocol, but we double the
7219 //OnRequestTexture(this, args); 7209 // priority of avatar textures to get avatars rezzing in faster than the
7210 // surrounding scene
7211 if ((ImageType)block.Type == ImageType.Baked)
7212 args.Priority *= 2.0f;
7220 7213
7221 // in the end, we null this, so we have to check if it's null 7214 // in the end, we null this, so we have to check if it's null
7222 if (m_imageManager != null) 7215 if (m_imageManager != null)
7223 { 7216 {
7224 m_imageManager.EnqueueReq(args); 7217 m_imageManager.EnqueueReq(args);
7225 }
7226 } 7218 }
7227 } 7219 }
7228 return true; 7220 return true;