3 files changed, 12 insertions, 5 deletions

diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
index 574bc63..72520c4 100644
--- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
@@ -51,6 +51,11 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
             m_scene = scene;
         }
 
+        public IScene Scene
+        {
+            get { return m_scene; }
+        }
+
         public void Say(string message)
         {
             SendOnChatFromViewer(message, ChatTypeEnum.Say);
@@ -259,7 +264,6 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
         public event FriendActionDelegate OnApproveFriendRequest;
         public event FriendActionDelegate OnDenyFriendRequest;
         public event FriendshipTermination OnTerminateFriendship;
-        public event PacketStats OnPacketStats;
 
         public event EconomyDataRequest OnEconomyDataRequest;
         public event MoneyBalanceRequest OnMoneyBalanceRequest;
@@ -518,7 +522,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
                                                   LLVector3 acc, LLQuaternion rotation, LLVector3 rvel, uint flags,
                                                   LLUUID objectID, LLUUID ownerID, string text, byte[] color,
                                                   uint parentID,
-                                                  byte[] particleSystem, byte clickAction, bool track)
+                                                  byte[] particleSystem, byte clickAction)
         {
         }
         public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID,
@@ -527,7 +531,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
                                                   LLUUID objectID, LLUUID ownerID, string text, byte[] color,
                                                   uint parentID,
                                                   byte[] particleSystem, byte clickAction, byte[] textureanimation,
-                                                  bool attachment, uint AttachmentPoint, LLUUID AssetId, LLUUID SoundId, double SoundVolume, byte SoundFlags, double SoundRadius, bool track)
+                                                  bool attachment, uint AttachmentPoint, LLUUID AssetId, LLUUID SoundId, double SoundVolume, byte SoundFlags, double SoundRadius)
         {
         }
         public virtual void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID,
@@ -711,6 +715,10 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
         {
         }
 
+        public void ProcessInPacket(Packet NewPack)
+        {
+        }
+
         public void Close(bool ShutdownCircuit)
         {
         }
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 626aaaa..6bf552c 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -2088,7 +2088,6 @@ namespace OpenSim.Region.Environment.Scenes
             client.OnMoneyTransferRequest += ProcessMoneyTransferRequest;
             client.OnParcelBuy += ProcessParcelBuy;
             client.OnAvatarPickerRequest += ProcessAvatarPickerRequest;
-            client.OnPacketStats += AddPacketStats;
             client.OnObjectIncludeInSearch += m_innerScene.MakeObjectSearchable;
             client.OnTeleportHomeRequest += TeleportClientHome;
             client.OnSetStartLocationRequest += SetHomeRezPoint;
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 253a83e..156310b 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -2085,7 +2085,7 @@ namespace OpenSim.Region.Environment.Scenes
             remoteClient.SendPrimitiveToClient(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, m_shape,
                                                lPos, Velocity, Acceleration, RotationOffset, RotationalVelocity, clientFlags, m_uuid, _ownerID,
                                                m_text, color, _parentID, m_particleSystem, m_clickAction, m_TextureAnimation, m_IsAttachment,
-                                               m_attachmentPoint,fromAssetID, Sound, SoundGain, SoundFlags, SoundRadius, false);
+                                               m_attachmentPoint,fromAssetID, Sound, SoundGain, SoundFlags, SoundRadius);
         }
 
         /// <summary>