aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorDiva Canto2010-12-10 23:16:26 -0800
committerDiva Canto2010-12-10 23:16:26 -0800
commitccb4f958c0dbb2daad4249a6b97d1c0b008b6a47 (patch)
treeacbf5fba3355bbad7710771fe0d75dad5a63dfcf /OpenSim/Region/ClientStack
parentRevert "A stab at mantis #5256. Separate ScenePresence updates from SceneObje... (diff)
downloadopensim-SC_OLD-ccb4f958c0dbb2daad4249a6b97d1c0b008b6a47.zip
opensim-SC_OLD-ccb4f958c0dbb2daad4249a6b97d1c0b008b6a47.tar.gz
opensim-SC_OLD-ccb4f958c0dbb2daad4249a6b97d1c0b008b6a47.tar.bz2
opensim-SC_OLD-ccb4f958c0dbb2daad4249a6b97d1c0b008b6a47.tar.xz
Another stab at mantis #5256
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs39
1 files changed, 20 insertions, 19 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index f125822..08da05f 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -3706,7 +3706,22 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3706 3706
3707 const float TIME_DILATION = 1.0f; 3707 const float TIME_DILATION = 1.0f;
3708 ushort timeDilation = Utils.FloatToUInt16(TIME_DILATION, 0.0f, 1.0f); 3708 ushort timeDilation = Utils.FloatToUInt16(TIME_DILATION, 0.0f, 1.0f);
3709 3709
3710 if (terseUpdateBlocks.IsValueCreated)
3711 {
3712 List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> blocks = terseUpdateBlocks.Value;
3713
3714 ImprovedTerseObjectUpdatePacket packet = new ImprovedTerseObjectUpdatePacket();
3715 packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
3716 packet.RegionData.TimeDilation = timeDilation;
3717 packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[blocks.Count];
3718
3719 for (int i = 0; i < blocks.Count; i++)
3720 packet.ObjectData[i] = blocks[i];
3721
3722 OutPacket(packet, ThrottleOutPacketType.Unknown, true);
3723 }
3724
3710 if (objectUpdateBlocks.IsValueCreated) 3725 if (objectUpdateBlocks.IsValueCreated)
3711 { 3726 {
3712 List<ObjectUpdatePacket.ObjectDataBlock> blocks = objectUpdateBlocks.Value; 3727 List<ObjectUpdatePacket.ObjectDataBlock> blocks = objectUpdateBlocks.Value;
@@ -3718,8 +3733,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3718 3733
3719 for (int i = 0; i < blocks.Count; i++) 3734 for (int i = 0; i < blocks.Count; i++)
3720 packet.ObjectData[i] = blocks[i]; 3735 packet.ObjectData[i] = blocks[i];
3721 3736
3722 OutPacket(packet, ThrottleOutPacketType.Task, true); 3737 OutPacket(packet, ThrottleOutPacketType.Unknown, true);
3723 } 3738 }
3724 3739
3725 if (compressedUpdateBlocks.IsValueCreated) 3740 if (compressedUpdateBlocks.IsValueCreated)
@@ -3733,24 +3748,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3733 3748
3734 for (int i = 0; i < blocks.Count; i++) 3749 for (int i = 0; i < blocks.Count; i++)
3735 packet.ObjectData[i] = blocks[i]; 3750 packet.ObjectData[i] = blocks[i];
3736 3751
3737 OutPacket(packet, ThrottleOutPacketType.Task, true); 3752 OutPacket(packet, ThrottleOutPacketType.Unknown, true);
3738 } 3753 }
3739 3754
3740 if (terseUpdateBlocks.IsValueCreated)
3741 {
3742 List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> blocks = terseUpdateBlocks.Value;
3743
3744 ImprovedTerseObjectUpdatePacket packet = new ImprovedTerseObjectUpdatePacket();
3745 packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
3746 packet.RegionData.TimeDilation = timeDilation;
3747 packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[blocks.Count];
3748
3749 for (int i = 0; i < blocks.Count; i++)
3750 packet.ObjectData[i] = blocks[i];
3751
3752 OutPacket(packet, ThrottleOutPacketType.Task, true);
3753 }
3754 } 3755 }
3755 3756
3756 #endregion Packet Sending 3757 #endregion Packet Sending