aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/LandManagement
diff options
context:
space:
mode:
authorTeravus Ovares2007-11-18 15:54:05 +0000
committerTeravus Ovares2007-11-18 15:54:05 +0000
commit615b40b68b2311433b855f8c1e961a8b71eb9b65 (patch)
treece9620d6f9e59e5e841f9746d738f6a71063eae4 /OpenSim/Region/Environment/LandManagement
parentcleaned up some mono compiler warnings (diff)
downloadopensim-SC_OLD-615b40b68b2311433b855f8c1e961a8b71eb9b65.zip
opensim-SC_OLD-615b40b68b2311433b855f8c1e961a8b71eb9b65.tar.gz
opensim-SC_OLD-615b40b68b2311433b855f8c1e961a8b71eb9b65.tar.bz2
opensim-SC_OLD-615b40b68b2311433b855f8c1e961a8b71eb9b65.tar.xz
* 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.
Diffstat (limited to 'OpenSim/Region/Environment/LandManagement')
-rw-r--r--OpenSim/Region/Environment/LandManagement/Land.cs12
-rw-r--r--OpenSim/Region/Environment/LandManagement/LandManager.cs2
2 files changed, 8 insertions, 6 deletions
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
191 landData.selectedPrims; 191 landData.selectedPrims;
192 updatePacket.ParcelData.UserLocation = landData.userLocation; 192 updatePacket.ParcelData.UserLocation = landData.userLocation;
193 updatePacket.ParcelData.UserLookAt = landData.userLookAt; 193 updatePacket.ParcelData.UserLookAt = landData.userLookAt;
194 remote_client.OutPacket((Packet) updatePacket); 194 remote_client.OutPacket((Packet) updatePacket, ThrottleOutPacketType.Task);
195 } 195 }
196 196
197 public void updateLandProperties(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client) 197 public void updateLandProperties(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client)
@@ -534,13 +534,14 @@ namespace OpenSim.Region.Environment.LandManagement
534 resultLocalIDs.RemoveAt(0); 534 resultLocalIDs.RemoveAt(0);
535 } 535 }
536 pack.Data = data; 536 pack.Data = data;
537 remote_client.OutPacket((Packet) pack); 537 remote_client.OutPacket((Packet) pack, ThrottleOutPacketType.Task);
538 } 538 }
539 } 539 }
540 540
541 public void sendLandObjectOwners(IClientAPI remote_client) 541 public void sendLandObjectOwners(IClientAPI remote_client)
542 { 542 {
543 Dictionary<LLUUID, int> ownersAndCount = new Dictionary<LLUUID, int>(); 543 Dictionary<LLUUID, int> ownersAndCount = new Dictionary<LLUUID, int>();
544 ParcelObjectOwnersReplyPacket pack = new ParcelObjectOwnersReplyPacket();
544 foreach (SceneObjectGroup obj in primsOverMe) 545 foreach (SceneObjectGroup obj in primsOverMe)
545 { 546 {
546 if (!ownersAndCount.ContainsKey(obj.OwnerID)) 547 if (!ownersAndCount.ContainsKey(obj.OwnerID))
@@ -570,11 +571,12 @@ namespace OpenSim.Region.Environment.LandManagement
570 571
571 num++; 572 num++;
572 } 573 }
573 574
574 ParcelObjectOwnersReplyPacket pack = new ParcelObjectOwnersReplyPacket();
575 pack.Data = dataBlock; 575 pack.Data = dataBlock;
576 remote_client.OutPacket(pack); 576
577
577 } 578 }
579 remote_client.OutPacket(pack, ThrottleOutPacketType.Task);
578 } 580 }
579 581
580 #endregion 582 #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
441 packet = new ParcelOverlayPacket(); 441 packet = new ParcelOverlayPacket();
442 packet.ParcelData.Data = byteArray; 442 packet.ParcelData.Data = byteArray;
443 packet.ParcelData.SequenceID = sequenceID; 443 packet.ParcelData.SequenceID = sequenceID;
444 remote_client.OutPacket((Packet) packet); 444 remote_client.OutPacket((Packet)packet, ThrottleOutPacketType.Task);
445 sequenceID++; 445 sequenceID++;
446 byteArray = new byte[LAND_BLOCKS_PER_PACKET]; 446 byteArray = new byte[LAND_BLOCKS_PER_PACKET];
447 } 447 }