From 230835dbaab80bc672b5cbd9f12e09930ed516e1 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Wed, 15 Oct 2008 17:06:47 +0000
Subject: * refactor: Remove OutPacket from the IClientAPI * I believe this is
 reasonable since code outside the Linden client stack shouldn't be aware of
 the packet format being used * I would love to have made the method
 protected, but the LoadBalancerPlugin is still calling it and resolving that
 would require more work

---
 OpenSim/Region/Environment/Modules/World/Land/LandObject.cs | 2 +-
 OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs   | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'OpenSim/Region/Environment/Modules/World')

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
 //                regionFlags |=  (uint)RegionFlags.AllowLandmark;
 //            if (landData.OwnerID == remote_client.AgentId)
 //                regionFlags |=  (uint)RegionFlags.AllowSetHome;
-            remote_client.SendLandProperties(remote_client, sequence_id,
+            remote_client.SendLandProperties(sequence_id,
                     snap_selection, request_result, landData,
                     (float)m_scene.RegionInfo.RegionSettings.ObjectBonus,
                     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
             get { return 1; }
         }
 
-        public virtual void OutPacket(Packet newPack, ThrottleOutPacketType packType)
-        {
-        }
-
         public virtual void SendWearables(AvatarWearable[] wearables, int serial)
         {
         }
@@ -840,7 +836,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
         {
         }
 
-        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)
+        public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor,int parcelObjectCapacity, int simObjectCapacity, uint regionFlags)
         {
         }
         public void SendLandAccessListData(List<UUID> avatars, uint accessFlag, int localLandID)
-- 
cgit v1.1