aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
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
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')
-rw-r--r--OpenSim/Region/Environment/EstateManager.cs2
-rw-r--r--OpenSim/Region/Environment/LandManagement/Land.cs12
-rw-r--r--OpenSim/Region/Environment/LandManagement/LandManager.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/TextureDownloadModule.cs6
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs2
7 files changed, 16 insertions, 14 deletions
diff --git a/OpenSim/Region/Environment/EstateManager.cs b/OpenSim/Region/Environment/EstateManager.cs
index 9e32b35..c569fc5 100644
--- a/OpenSim/Region/Environment/EstateManager.cs
+++ b/OpenSim/Region/Environment/EstateManager.cs
@@ -370,7 +370,7 @@ namespace OpenSim.Region.Environment
370 regionInfoPacket.RegionInfo.UseEstateSun = !m_regInfo.EstateSettings.useFixedSun; 370 regionInfoPacket.RegionInfo.UseEstateSun = !m_regInfo.EstateSettings.useFixedSun;
371 regionInfoPacket.RegionInfo.WaterHeight = m_regInfo.EstateSettings.waterHeight; 371 regionInfoPacket.RegionInfo.WaterHeight = m_regInfo.EstateSettings.waterHeight;
372 372
373 remote_client.OutPacket(regionInfoPacket); 373 remote_client.OutPacket(regionInfoPacket, ThrottleOutPacketType.Task);
374 } 374 }
375 375
376 public void sendRegionHandshake(IClientAPI remoteClient) 376 public void sendRegionHandshake(IClientAPI remoteClient)
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 }
diff --git a/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs b/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
index 87d6231..902b669 100644
--- a/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
+++ b/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
@@ -212,7 +212,7 @@ namespace OpenSim.Region.Environment.Modules
212 im.ImageID.Size = (uint) m_asset.Data.Length; 212 im.ImageID.Size = (uint) m_asset.Data.Length;
213 im.ImageData.Data = m_asset.Data; 213 im.ImageData.Data = m_asset.Data;
214 im.ImageID.Codec = 2; 214 im.ImageID.Codec = 2;
215 req.RequestUser.OutPacket(im); 215 req.RequestUser.OutPacket(im, ThrottleOutPacketType.Texture);
216 PacketCounter++; 216 PacketCounter++;
217 } 217 }
218 else 218 else
@@ -225,7 +225,7 @@ namespace OpenSim.Region.Environment.Modules
225 im.ImageData.Data = new byte[600]; 225 im.ImageData.Data = new byte[600];
226 Array.Copy(m_asset.Data, 0, im.ImageData.Data, 0, 600); 226 Array.Copy(m_asset.Data, 0, im.ImageData.Data, 0, 600);
227 im.ImageID.Codec = 2; 227 im.ImageID.Codec = 2;
228 req.RequestUser.OutPacket(im); 228 req.RequestUser.OutPacket(im, ThrottleOutPacketType.Texture);
229 PacketCounter++; 229 PacketCounter++;
230 } 230 }
231 } 231 }
@@ -239,7 +239,7 @@ namespace OpenSim.Region.Environment.Modules
239 if (size > 1000) size = 1000; 239 if (size > 1000) size = 1000;
240 im.ImageData.Data = new byte[size]; 240 im.ImageData.Data = new byte[size];
241 Array.Copy(m_asset.Data, 600 + (1000*(PacketCounter - 1)), im.ImageData.Data, 0, size); 241 Array.Copy(m_asset.Data, 600 + (1000*(PacketCounter - 1)), im.ImageData.Data, 0, size);
242 req.RequestUser.OutPacket(im); 242 req.RequestUser.OutPacket(im, ThrottleOutPacketType.Texture);
243 PacketCounter++; 243 PacketCounter++;
244 } 244 }
245 } 245 }
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 87bd0c1..dcba9bd 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -962,7 +962,7 @@ namespace OpenSim.Region.Environment.Scenes
962 if (presence != null) 962 if (presence != null)
963 { 963 {
964 libsecondlife.Packets.DisableSimulatorPacket disable = new libsecondlife.Packets.DisableSimulatorPacket(); 964 libsecondlife.Packets.DisableSimulatorPacket disable = new libsecondlife.Packets.DisableSimulatorPacket();
965 presence.ControllingClient.OutPacket(disable); 965 presence.ControllingClient.OutPacket(disable, ThrottleOutPacketType.Task);
966 } 966 }
967 } 967 }
968 } 968 }
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 628bd72..38962c1 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -568,7 +568,7 @@ namespace OpenSim.Region.Environment.Scenes
568 objPropDB.Name = Helpers.StringToField(RootPart.Name); 568 objPropDB.Name = Helpers.StringToField(RootPart.Name);
569 objPropDB.Description = Helpers.StringToField(RootPart.Description); 569 objPropDB.Description = Helpers.StringToField(RootPart.Description);
570 objPropFamilyPack.ObjectData = objPropDB; 570 objPropFamilyPack.ObjectData = objPropDB;
571 remoteClient.OutPacket(objPropFamilyPack); 571 remoteClient.OutPacket(objPropFamilyPack, ThrottleOutPacketType.Task);
572 572
573 } 573 }
574 public void SetPartOwner(SceneObjectPart part, LLUUID cAgentID, LLUUID cGroupID) 574 public void SetPartOwner(SceneObjectPart part, LLUUID cAgentID, LLUUID cGroupID)
@@ -956,7 +956,7 @@ namespace OpenSim.Region.Environment.Scenes
956 proper.ObjectData[0].EveryoneMask = m_rootPart.EveryoneMask; 956 proper.ObjectData[0].EveryoneMask = m_rootPart.EveryoneMask;
957 proper.ObjectData[0].BaseMask = m_rootPart.BaseMask; 957 proper.ObjectData[0].BaseMask = m_rootPart.BaseMask;
958 958
959 client.OutPacket(proper); 959 client.OutPacket(proper, ThrottleOutPacketType.Task);
960 } 960 }
961 961
962 /// <summary> 962 /// <summary>
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 38523e0..7927de6 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -641,7 +641,7 @@ namespace OpenSim.Region.Environment.Scenes
641 avatarSitResponse.SitTransform.SitPosition = offset; 641 avatarSitResponse.SitTransform.SitPosition = offset;
642 avatarSitResponse.SitTransform.SitRotation = new LLQuaternion(0.0f, 0.0f, 0.0f, 1.0f); 642 avatarSitResponse.SitTransform.SitRotation = new LLQuaternion(0.0f, 0.0f, 0.0f, 1.0f);
643 643
644 remoteClient.OutPacket(avatarSitResponse); 644 remoteClient.OutPacket(avatarSitResponse, ThrottleOutPacketType.Task);
645 } 645 }
646 646
647 public void HandleAgentRequestSit(IClientAPI remoteClient, LLUUID agentID, LLUUID targetID, LLVector3 offset) 647 public void HandleAgentRequestSit(IClientAPI remoteClient, LLUUID agentID, LLUUID targetID, LLVector3 offset)