aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/IClientAPI.cs4
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs14
-rw-r--r--OpenSim/Region/Environment/Modules/World/Land/LandObject.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs6
-rw-r--r--OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs15
5 files changed, 17 insertions, 24 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 89fc0af..db6025d 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -625,8 +625,6 @@ namespace OpenSim.Framework
625 625
626 // void ActivateGesture(UUID assetId, UUID gestureId); 626 // void ActivateGesture(UUID assetId, UUID gestureId);
627 627
628 // [Obsolete("IClientAPI.OutPacket SHOULD NOT EXIST outside of LLClientView please refactor appropriately.")]
629 void OutPacket(Packet newPack, ThrottleOutPacketType packType);
630 void SendWearables(AvatarWearable[] wearables, int serial); 628 void SendWearables(AvatarWearable[] wearables, int serial);
631 void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry); 629 void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry);
632 void SendStartPingCheck(byte seq); 630 void SendStartPingCheck(byte seq);
@@ -774,7 +772,7 @@ namespace OpenSim.Framework
774 void SendEstateCovenantInformation(UUID covenant); 772 void SendEstateCovenantInformation(UUID covenant);
775 void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, string abuseEmail, UUID estateOwner); 773 void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, string abuseEmail, UUID estateOwner);
776 774
777 void SendLandProperties(IClientAPI remote_client, int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags); 775 void SendLandProperties(int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags);
778 void SendLandAccessListData(List<UUID> avatars, uint accessFlag, int localLandID); 776 void SendLandAccessListData(List<UUID> avatars, uint accessFlag, int localLandID);
779 void SendForceClientSelectObjects(List<uint> objectIDs); 777 void SendForceClientSelectObjects(List<uint> objectIDs);
780 void SendLandObjectOwners(Dictionary<UUID, int> ownersAndCount); 778 void SendLandObjectOwners(Dictionary<UUID, int> ownersAndCount);
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 251ba78..198d660 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -2921,7 +2921,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2921 this.OutPacket(packet, ThrottleOutPacketType.Task); 2921 this.OutPacket(packet, ThrottleOutPacketType.Task);
2922 } 2922 }
2923 2923
2924 public void SendLandProperties(IClientAPI remote_client, int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) 2924 public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags)
2925 { 2925 {
2926 ParcelPropertiesPacket updatePacket = (ParcelPropertiesPacket)PacketPool.Instance.GetPacket(PacketType.ParcelProperties); 2926 ParcelPropertiesPacket updatePacket = (ParcelPropertiesPacket)PacketPool.Instance.GetPacket(PacketType.ParcelProperties);
2927 // TODO: don't create new blocks if recycling an old packet 2927 // TODO: don't create new blocks if recycling an old packet
@@ -2999,7 +2999,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2999 updatePacket.ParcelData.UserLocation = landData.UserLocation; 2999 updatePacket.ParcelData.UserLocation = landData.UserLocation;
3000 updatePacket.ParcelData.UserLookAt = landData.UserLookAt; 3000 updatePacket.ParcelData.UserLookAt = landData.UserLookAt;
3001 updatePacket.Header.Zerocoded = true; 3001 updatePacket.Header.Zerocoded = true;
3002 remote_client.OutPacket((Packet)updatePacket, ThrottleOutPacketType.Task); 3002
3003 OutPacket((Packet)updatePacket, ThrottleOutPacketType.Task);
3003 } 3004 }
3004 3005
3005 public void SendLandAccessListData(List<UUID> avatars, uint accessFlag, int localLandID) 3006 public void SendLandAccessListData(List<UUID> avatars, uint accessFlag, int localLandID)
@@ -3945,14 +3946,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3945 3946
3946 3947
3947 /// <summary> 3948 /// <summary>
3948 /// The dreaded OutPacket. This should only be called from within 3949 /// This is the starting point for sending a simulator packet out to the client.
3949 /// the ClientStack itself right now 3950 ///
3950 /// This is the entry point for simulator packets to go out to 3951 /// Please do not call this from outside the LindenUDP client stack.
3951 /// the client.
3952 /// </summary> 3952 /// </summary>
3953 /// <param name="NewPack"></param> 3953 /// <param name="NewPack"></param>
3954 /// <param name="throttlePacketType">Corresponds to the type of data that is going out. Enum</param> 3954 /// <param name="throttlePacketType">Corresponds to the type of data that is going out. Enum</param>
3955 public virtual void OutPacket(Packet NewPack, ThrottleOutPacketType throttlePacketType) 3955 public void OutPacket(Packet NewPack, ThrottleOutPacketType throttlePacketType)
3956 { 3956 {
3957 m_PacketHandler.OutPacket(NewPack, throttlePacketType); 3957 m_PacketHandler.OutPacket(NewPack, throttlePacketType);
3958 } 3958 }
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
index 14f43b4..097e55f 100644
--- a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
+++ b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
@@ -172,7 +172,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
172// regionFlags |= (uint)RegionFlags.AllowLandmark; 172// regionFlags |= (uint)RegionFlags.AllowLandmark;
173// if (landData.OwnerID == remote_client.AgentId) 173// if (landData.OwnerID == remote_client.AgentId)
174// regionFlags |= (uint)RegionFlags.AllowSetHome; 174// regionFlags |= (uint)RegionFlags.AllowSetHome;
175 remote_client.SendLandProperties(remote_client, sequence_id, 175 remote_client.SendLandProperties(sequence_id,
176 snap_selection, request_result, landData, 176 snap_selection, request_result, landData,
177 (float)m_scene.RegionInfo.RegionSettings.ObjectBonus, 177 (float)m_scene.RegionInfo.RegionSettings.ObjectBonus,
178 getParcelMaxPrimCount(this), 178 getParcelMaxPrimCount(this),
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
index 86f3288..e5e6a79 100644
--- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
@@ -414,10 +414,6 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
414 get { return 1; } 414 get { return 1; }
415 } 415 }
416 416
417 public virtual void OutPacket(Packet newPack, ThrottleOutPacketType packType)
418 {
419 }
420
421 public virtual void SendWearables(AvatarWearable[] wearables, int serial) 417 public virtual void SendWearables(AvatarWearable[] wearables, int serial)
422 { 418 {
423 } 419 }
@@ -840,7 +836,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
840 { 836 {
841 } 837 }
842 838
843 public void SendLandProperties(IClientAPI remote_client, int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor,int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) 839 public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor,int parcelObjectCapacity, int simObjectCapacity, uint regionFlags)
844 { 840 {
845 } 841 }
846 public void SendLandAccessListData(List<UUID> avatars, uint accessFlag, int localLandID) 842 public void SendLandAccessListData(List<UUID> avatars, uint accessFlag, int localLandID)
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index 663e768..cc49072 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -326,11 +326,6 @@ namespace OpenSim.Region.Examples.SimpleModule
326 { 326 {
327 } 327 }
328 328
329
330 public virtual void OutPacket(Packet newPack, ThrottleOutPacketType packType)
331 {
332 }
333
334 public virtual void SendWearables(AvatarWearable[] wearables, int serial) 329 public virtual void SendWearables(AvatarWearable[] wearables, int serial)
335 { 330 {
336 } 331 }
@@ -821,38 +816,42 @@ namespace OpenSim.Region.Examples.SimpleModule
821 public void SendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args) 816 public void SendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args)
822 { 817 {
823 } 818 }
819
824 public void SendEstateCovenantInformation(UUID covenant) 820 public void SendEstateCovenantInformation(UUID covenant)
825 { 821 {
826 } 822 }
823
827 public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, string abuseEmail, UUID estateOwner) 824 public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, string abuseEmail, UUID estateOwner)
828 { 825 {
829 } 826 }
830 827
831 public void SendLandProperties(IClientAPI remote_client, int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) 828 public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags)
832 { 829 {
833 } 830 }
831
834 public void SendLandAccessListData(List<UUID> avatars, uint accessFlag, int localLandID) 832 public void SendLandAccessListData(List<UUID> avatars, uint accessFlag, int localLandID)
835 { 833 {
836 } 834 }
835
837 public void SendForceClientSelectObjects(List<uint> objectIDs) 836 public void SendForceClientSelectObjects(List<uint> objectIDs)
838 { 837 {
839 } 838 }
839
840 public void SendLandObjectOwners(Dictionary<UUID, int> ownersAndCount) 840 public void SendLandObjectOwners(Dictionary<UUID, int> ownersAndCount)
841 { 841 {
842 } 842 }
843
843 public void SendLandParcelOverlay(byte[] data, int sequence_id) 844 public void SendLandParcelOverlay(byte[] data, int sequence_id)
844 { 845 {
845 } 846 }
846 847
847 public void SendParcelMediaCommand(uint flags, ParcelMediaCommandEnum command, float time) 848 public void SendParcelMediaCommand(uint flags, ParcelMediaCommandEnum command, float time)
848 { 849 {
849
850 } 850 }
851 851
852 public void SendParcelMediaUpdate(string mediaUrl, UUID mediaTextureID, byte autoScale, string mediaType, 852 public void SendParcelMediaUpdate(string mediaUrl, UUID mediaTextureID, byte autoScale, string mediaType,
853 string mediaDesc, int mediaWidth, int mediaHeight, byte mediaLoop) 853 string mediaDesc, int mediaWidth, int mediaHeight, byte mediaLoop)
854 { 854 {
855
856 } 855 }
857 856
858 public void SendGroupNameReply(UUID groupLLUID, string GroupName) 857 public void SendGroupNameReply(UUID groupLLUID, string GroupName)