* 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.

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
             regionInfoPacket.RegionInfo.UseEstateSun = !m_regInfo.EstateSettings.useFixedSun;
             regionInfoPacket.RegionInfo.WaterHeight = m_regInfo.EstateSettings.waterHeight;
 
-            remote_client.OutPacket(regionInfoPacket);
+            remote_client.OutPacket(regionInfoPacket, ThrottleOutPacketType.Task);
         }
 
         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
                                                  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<LLUUID, int> ownersAndCount = new Dictionary<LLUUID, int>();
+            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];
                     }
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
                         im.ImageID.Size = (uint) m_asset.Data.Length;
                         im.ImageData.Data = m_asset.Data;
                         im.ImageID.Codec = 2;
-                        req.RequestUser.OutPacket(im);
+                        req.RequestUser.OutPacket(im, ThrottleOutPacketType.Texture);
                         PacketCounter++;
                     }
                     else
@@ -225,7 +225,7 @@ namespace OpenSim.Region.Environment.Modules
                         im.ImageData.Data = new byte[600];
                         Array.Copy(m_asset.Data, 0, im.ImageData.Data, 0, 600);
                         im.ImageID.Codec = 2;
-                        req.RequestUser.OutPacket(im);
+                        req.RequestUser.OutPacket(im, ThrottleOutPacketType.Texture);
                         PacketCounter++;
                     }
                 }
@@ -239,7 +239,7 @@ namespace OpenSim.Region.Environment.Modules
                     if (size > 1000) size = 1000;
                     im.ImageData.Data = new byte[size];
                     Array.Copy(m_asset.Data, 600 + (1000*(PacketCounter - 1)), im.ImageData.Data, 0, size);
-                    req.RequestUser.OutPacket(im);
+                    req.RequestUser.OutPacket(im, ThrottleOutPacketType.Texture);
                     PacketCounter++;
                 }
             }
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
                 if (presence != null)
                 {
                     libsecondlife.Packets.DisableSimulatorPacket disable = new libsecondlife.Packets.DisableSimulatorPacket();
-                    presence.ControllingClient.OutPacket(disable);
+                    presence.ControllingClient.OutPacket(disable, ThrottleOutPacketType.Task);
                 }
             }
         }
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
             objPropDB.Name = Helpers.StringToField(RootPart.Name);
             objPropDB.Description = Helpers.StringToField(RootPart.Description);
             objPropFamilyPack.ObjectData = objPropDB;
-            remoteClient.OutPacket(objPropFamilyPack);
+            remoteClient.OutPacket(objPropFamilyPack, ThrottleOutPacketType.Task);
 
         }
         public void SetPartOwner(SceneObjectPart part, LLUUID cAgentID, LLUUID cGroupID)
@@ -956,7 +956,7 @@ namespace OpenSim.Region.Environment.Scenes
             proper.ObjectData[0].EveryoneMask = m_rootPart.EveryoneMask;
             proper.ObjectData[0].BaseMask = m_rootPart.BaseMask;
 
-            client.OutPacket(proper);
+            client.OutPacket(proper, ThrottleOutPacketType.Task);
         }
 
         /// <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
             avatarSitResponse.SitTransform.SitPosition = offset;
             avatarSitResponse.SitTransform.SitRotation = new LLQuaternion(0.0f, 0.0f, 0.0f, 1.0f);
 
-            remoteClient.OutPacket(avatarSitResponse);
+            remoteClient.OutPacket(avatarSitResponse, ThrottleOutPacketType.Task);
         }
 
         public void HandleAgentRequestSit(IClientAPI remoteClient, LLUUID agentID, LLUUID targetID, LLVector3 offset)