aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorJohn Hurliman2009-10-26 18:22:32 -0700
committerJohn Hurliman2009-10-26 18:22:32 -0700
commitb6651ce79017bc7c6d1df66757e26a74bacfc36f (patch)
treed6f9835eff9f7d35da3fcdd3cd063cd72cba41c7 /OpenSim/Region/ClientStack
parentRemoving the ClientManager reference from IScene and hiding it entirely insid... (diff)
downloadopensim-SC_OLD-b6651ce79017bc7c6d1df66757e26a74bacfc36f.zip
opensim-SC_OLD-b6651ce79017bc7c6d1df66757e26a74bacfc36f.tar.gz
opensim-SC_OLD-b6651ce79017bc7c6d1df66757e26a74bacfc36f.tar.bz2
opensim-SC_OLD-b6651ce79017bc7c6d1df66757e26a74bacfc36f.tar.xz
* Double the priority on avatar bake texture requests to get avatars rezzing in faster than the surrounding scene
* Adds duplicate tracking for SceneObjectParts and ScenePresences to avoid sending out duplicate ImprovedTerseObjectUpdate packets
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs18
1 files changed, 14 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index edfb13c..31028b3 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -6756,11 +6756,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6756 if (OnRequestTexture != null) 6756 if (OnRequestTexture != null)
6757 { 6757 {
6758 TextureRequestArgs args = new TextureRequestArgs(); 6758 TextureRequestArgs args = new TextureRequestArgs();
6759 args.RequestedAssetID = imageRequest.RequestImage[i].Image; 6759
6760 args.DiscardLevel = imageRequest.RequestImage[i].DiscardLevel; 6760 RequestImagePacket.RequestImageBlock block = imageRequest.RequestImage[i];
6761 args.PacketNumber = imageRequest.RequestImage[i].Packet; 6761
6762 args.Priority = imageRequest.RequestImage[i].DownloadPriority; 6762 args.RequestedAssetID = block.Image;
6763 args.DiscardLevel = block.DiscardLevel;
6764 args.PacketNumber = block.Packet;
6765 args.Priority = block.DownloadPriority;
6763 args.requestSequence = imageRequest.Header.Sequence; 6766 args.requestSequence = imageRequest.Header.Sequence;
6767
6768 // NOTE: This is not a built in part of the LLUDP protocol, but we double the
6769 // priority of avatar textures to get avatars rezzing in faster than the
6770 // surrounding scene
6771 if ((ImageType)block.Type == ImageType.Baked)
6772 args.Priority *= 2.0f;
6773
6764 //handlerTextureRequest = OnRequestTexture; 6774 //handlerTextureRequest = OnRequestTexture;
6765 6775
6766 //if (handlerTextureRequest != null) 6776 //if (handlerTextureRequest != null)