diff options
author | Diva Canto | 2010-12-23 10:05:08 -0800 |
---|---|---|
committer | Diva Canto | 2010-12-23 10:05:08 -0800 |
commit | 54418c5e69c5085750762e2bd3220ae7a6808471 (patch) | |
tree | 18a82baa2bb4d525870160a7e0e411f0ddb0f2e2 /OpenSim/Region/ClientStack | |
parent | Added a counter to NewFiles in Xfers to account for simultaneous object inven... (diff) | |
download | opensim-SC_OLD-54418c5e69c5085750762e2bd3220ae7a6808471.zip opensim-SC_OLD-54418c5e69c5085750762e2bd3220ae7a6808471.tar.gz opensim-SC_OLD-54418c5e69c5085750762e2bd3220ae7a6808471.tar.bz2 opensim-SC_OLD-54418c5e69c5085750762e2bd3220ae7a6808471.tar.xz |
Removed unused code -- this was the previous version of UDP texture sending, which now lives entirely in LindenUDP space.
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 929f282..4e4ecea 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -7189,34 +7189,26 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7189 | //handlerTextureRequest = null; | 7189 | //handlerTextureRequest = null; |
7190 | for (int i = 0; i < imageRequest.RequestImage.Length; i++) | 7190 | for (int i = 0; i < imageRequest.RequestImage.Length; i++) |
7191 | { | 7191 | { |
7192 | if (OnRequestTexture != null) | 7192 | TextureRequestArgs args = new TextureRequestArgs(); |
7193 | { | ||
7194 | TextureRequestArgs args = new TextureRequestArgs(); | ||
7195 | |||
7196 | RequestImagePacket.RequestImageBlock block = imageRequest.RequestImage[i]; | ||
7197 | |||
7198 | args.RequestedAssetID = block.Image; | ||
7199 | args.DiscardLevel = block.DiscardLevel; | ||
7200 | args.PacketNumber = block.Packet; | ||
7201 | args.Priority = block.DownloadPriority; | ||
7202 | args.requestSequence = imageRequest.Header.Sequence; | ||
7203 | 7193 | ||
7204 | // NOTE: This is not a built in part of the LLUDP protocol, but we double the | 7194 | RequestImagePacket.RequestImageBlock block = imageRequest.RequestImage[i]; |
7205 | // priority of avatar textures to get avatars rezzing in faster than the | ||
7206 | // surrounding scene | ||
7207 | if ((ImageType)block.Type == ImageType.Baked) | ||
7208 | args.Priority *= 2.0f; | ||
7209 | 7195 | ||
7210 | //handlerTextureRequest = OnRequestTexture; | 7196 | args.RequestedAssetID = block.Image; |
7197 | args.DiscardLevel = block.DiscardLevel; | ||
7198 | args.PacketNumber = block.Packet; | ||
7199 | args.Priority = block.DownloadPriority; | ||
7200 | args.requestSequence = imageRequest.Header.Sequence; | ||
7211 | 7201 | ||
7212 | //if (handlerTextureRequest != null) | 7202 | // NOTE: This is not a built in part of the LLUDP protocol, but we double the |
7213 | //OnRequestTexture(this, args); | 7203 | // priority of avatar textures to get avatars rezzing in faster than the |
7204 | // surrounding scene | ||
7205 | if ((ImageType)block.Type == ImageType.Baked) | ||
7206 | args.Priority *= 2.0f; | ||
7214 | 7207 | ||
7215 | // in the end, we null this, so we have to check if it's null | 7208 | // in the end, we null this, so we have to check if it's null |
7216 | if (m_imageManager != null) | 7209 | if (m_imageManager != null) |
7217 | { | 7210 | { |
7218 | m_imageManager.EnqueueReq(args); | 7211 | m_imageManager.EnqueueReq(args); |
7219 | } | ||
7220 | } | 7212 | } |
7221 | } | 7213 | } |
7222 | return true; | 7214 | return true; |