aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs11
1 files changed, 7 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 992d06f..b8c99cf 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -1856,7 +1856,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1856 economyData.Info.TeleportMinPrice = TeleportMinPrice; 1856 economyData.Info.TeleportMinPrice = TeleportMinPrice;
1857 economyData.Info.TeleportPriceExponent = TeleportPriceExponent; 1857 economyData.Info.TeleportPriceExponent = TeleportPriceExponent;
1858 economyData.Header.Reliable = true; 1858 economyData.Header.Reliable = true;
1859 OutPacket(economyData, ThrottleOutPacketType.Unknown); 1859 OutPacket(economyData, ThrottleOutPacketType.Task);
1860 } 1860 }
1861 1861
1862 public void SendAvatarPickerReply(AvatarPickerReplyAgentDataArgs AgentData, List<AvatarPickerReplyDataArgs> Data) 1862 public void SendAvatarPickerReply(AvatarPickerReplyAgentDataArgs AgentData, List<AvatarPickerReplyDataArgs> Data)
@@ -3234,7 +3234,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3234 terse.ObjectData[i] = m_avatarTerseUpdates.Dequeue(); 3234 terse.ObjectData[i] = m_avatarTerseUpdates.Dequeue();
3235 } 3235 }
3236 3236
3237 OutPacket(terse, ThrottleOutPacketType.Unknown); // HACK: Unthrottled for testing 3237 // HACK: Using the task category until the tiered reprioritization code is in
3238 OutPacket(terse, ThrottleOutPacketType.Task);
3238 } 3239 }
3239 3240
3240 public void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations) 3241 public void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations)
@@ -4951,6 +4952,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4951 /// <param name="throttlePacketType">Throttling category for the packet</param> 4952 /// <param name="throttlePacketType">Throttling category for the packet</param>
4952 protected void OutPacket(Packet packet, ThrottleOutPacketType throttlePacketType) 4953 protected void OutPacket(Packet packet, ThrottleOutPacketType throttlePacketType)
4953 { 4954 {
4955 if (ChildAgentStatus())
4956 Thread.Sleep(200);
4954 m_udpServer.SendPacket(m_udpClient, packet, throttlePacketType, true); 4957 m_udpServer.SendPacket(m_udpClient, packet, throttlePacketType, true);
4955 } 4958 }
4956 4959
@@ -9843,7 +9846,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
9843 commandMessagePacket.CommandBlock.Command = (uint)command; 9846 commandMessagePacket.CommandBlock.Command = (uint)command;
9844 commandMessagePacket.CommandBlock.Time = time; 9847 commandMessagePacket.CommandBlock.Time = time;
9845 9848
9846 OutPacket(commandMessagePacket, ThrottleOutPacketType.Unknown); 9849 OutPacket(commandMessagePacket, ThrottleOutPacketType.Task);
9847 } 9850 }
9848 9851
9849 public void SendParcelMediaUpdate(string mediaUrl, UUID mediaTextureID, 9852 public void SendParcelMediaUpdate(string mediaUrl, UUID mediaTextureID,
@@ -9861,7 +9864,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
9861 updatePacket.DataBlockExtended.MediaHeight = mediaHeight; 9864 updatePacket.DataBlockExtended.MediaHeight = mediaHeight;
9862 updatePacket.DataBlockExtended.MediaLoop = mediaLoop; 9865 updatePacket.DataBlockExtended.MediaLoop = mediaLoop;
9863 9866
9864 OutPacket(updatePacket, ThrottleOutPacketType.Unknown); 9867 OutPacket(updatePacket, ThrottleOutPacketType.Task);
9865 } 9868 }
9866 9869
9867 #endregion 9870 #endregion