From 615b40b68b2311433b855f8c1e961a8b71eb9b65 Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Sun, 18 Nov 2007 15:54:05 +0000 Subject: * Refactored IClientAPI.OutPacket to require a second mandatory parameter. This parameter has an enum:int ThrottleOutPacketType and contains types; Resend, Land, Wind, Cloud, Task, Texture, and Asset. --- OpenSim/Region/Environment/LandManagement/Land.cs | 12 +++++++----- OpenSim/Region/Environment/LandManagement/LandManager.cs | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'OpenSim/Region/Environment/LandManagement') diff --git a/OpenSim/Region/Environment/LandManagement/Land.cs b/OpenSim/Region/Environment/LandManagement/Land.cs index bf35b57..b566387 100644 --- a/OpenSim/Region/Environment/LandManagement/Land.cs +++ b/OpenSim/Region/Environment/LandManagement/Land.cs @@ -191,7 +191,7 @@ namespace OpenSim.Region.Environment.LandManagement landData.selectedPrims; updatePacket.ParcelData.UserLocation = landData.userLocation; updatePacket.ParcelData.UserLookAt = landData.userLookAt; - remote_client.OutPacket((Packet) updatePacket); + remote_client.OutPacket((Packet) updatePacket, ThrottleOutPacketType.Task); } public void updateLandProperties(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client) @@ -534,13 +534,14 @@ namespace OpenSim.Region.Environment.LandManagement resultLocalIDs.RemoveAt(0); } pack.Data = data; - remote_client.OutPacket((Packet) pack); + remote_client.OutPacket((Packet) pack, ThrottleOutPacketType.Task); } } public void sendLandObjectOwners(IClientAPI remote_client) { Dictionary ownersAndCount = new Dictionary(); + ParcelObjectOwnersReplyPacket pack = new ParcelObjectOwnersReplyPacket(); foreach (SceneObjectGroup obj in primsOverMe) { if (!ownersAndCount.ContainsKey(obj.OwnerID)) @@ -570,11 +571,12 @@ namespace OpenSim.Region.Environment.LandManagement num++; } - - ParcelObjectOwnersReplyPacket pack = new ParcelObjectOwnersReplyPacket(); + pack.Data = dataBlock; - remote_client.OutPacket(pack); + + } + remote_client.OutPacket(pack, ThrottleOutPacketType.Task); } #endregion diff --git a/OpenSim/Region/Environment/LandManagement/LandManager.cs b/OpenSim/Region/Environment/LandManagement/LandManager.cs index a1cfa8a..dfeb36a 100644 --- a/OpenSim/Region/Environment/LandManagement/LandManager.cs +++ b/OpenSim/Region/Environment/LandManagement/LandManager.cs @@ -441,7 +441,7 @@ namespace OpenSim.Region.Environment.LandManagement packet = new ParcelOverlayPacket(); packet.ParcelData.Data = byteArray; packet.ParcelData.SequenceID = sequenceID; - remote_client.OutPacket((Packet) packet); + remote_client.OutPacket((Packet)packet, ThrottleOutPacketType.Task); sequenceID++; byteArray = new byte[LAND_BLOCKS_PER_PACKET]; } -- cgit v1.1