diff options
author | Teravus Ovares | 2007-11-18 15:54:05 +0000 |
---|---|---|
committer | Teravus Ovares | 2007-11-18 15:54:05 +0000 |
commit | 615b40b68b2311433b855f8c1e961a8b71eb9b65 (patch) | |
tree | ce9620d6f9e59e5e841f9746d738f6a71063eae4 /OpenSim/Region/Environment/Scenes | |
parent | cleaned up some mono compiler warnings (diff) | |
download | opensim-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/Scenes')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 2 |
3 files changed, 4 insertions, 4 deletions
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) |