number of changes

5 files changed, 27 insertions, 14 deletions

diff --git a/Common/OpenSim.Framework/AgentInventory.cs b/Common/OpenSim.Framework/AgentInventory.cs
index 6fdd6c5..f2ef729 100644
--- a/Common/OpenSim.Framework/AgentInventory.cs
+++ b/Common/OpenSim.Framework/AgentInventory.cs
@@ -237,15 +237,4 @@ namespace OpenSim.Framework.Inventory
             return result;

         }

     }

-

-    public class AvatarWearable

-    {

-        public LLUUID AssetID = new LLUUID("00000000-0000-0000-0000-000000000000");

-        public LLUUID ItemID = new LLUUID("00000000-0000-0000-0000-000000000000");

-

-        public AvatarWearable()

-        {

-

-        }

-    }

 }

diff --git a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
index add6c00..8ba1571 100644
--- a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
+++ b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
@@ -18,6 +18,8 @@ namespace OpenSim.Framework.Interfaces
     public delegate void GenericCall2();

     public delegate void GenericCall3(Packet packet); // really don't want to be passing packets in these events, so this is very temporary.

     public delegate void GenericCall4(Packet packet, IClientAPI remoteClient);

+    public delegate void GenericCall5(IClientAPI remoteClient, bool status);

+    public delegate void GenericCall6(LLUUID uid);

     public delegate void UpdateShape(uint localID, ObjectShapePacket.ObjectDataBlock shapeBlock);

     public delegate void ObjectSelect(uint localID, IClientAPI remoteClient);

     public delegate void UpdatePrimFlags(uint localID, Packet packet, IClientAPI remoteClient);

@@ -25,6 +27,7 @@ namespace OpenSim.Framework.Interfaces
     public delegate void UpdatePrimVector(uint localID, LLVector3 pos, IClientAPI remoteClient);

     public delegate void UpdatePrimRotation(uint localID, LLQuaternion rot, IClientAPI remoteClient);

     public delegate void StatusChange(bool status);

+    public delegate void NewAvatar(IClientAPI remoteClient, LLUUID agentID, bool status);

 

     public interface IClientAPI

     {

@@ -50,6 +53,8 @@ namespace OpenSim.Framework.Interfaces
         event UpdatePrimVector OnUpdatePrimScale;

         event StatusChange OnChildAgentStatus;

         event GenericCall2 OnStopMovement;

+        event NewAvatar OnNewAvatar;

+        event GenericCall6 OnRemoveAvatar;

 

         LLVector3 StartPos

         {

@@ -63,7 +68,7 @@ namespace OpenSim.Framework.Interfaces
         }

 

         void OutPacket(Packet newPack);

-        void SendAppearance(AvatarWearable[] wearables);

+        void SendWearables(AvatarWearable[] wearables);

         void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);

     }

 }

diff --git a/Common/OpenSim.Framework/Interfaces/IWorld.cs b/Common/OpenSim.Framework/Interfaces/IWorld.cs
index 433e540..ab2d63d 100644
--- a/Common/OpenSim.Framework/Interfaces/IWorld.cs
+++ b/Common/OpenSim.Framework/Interfaces/IWorld.cs
@@ -8,8 +8,8 @@ namespace OpenSim.Framework.Interfaces
 {

     public interface IWorld

     {

-        bool AddNewAvatar(IClientAPI remoteClient, bool childAgent);

-        bool RemoveAvatar(LLUUID agentID);

+        void AddNewAvatar(IClientAPI remoteClient, LLUUID agentID, bool child);

+        void RemoveAvatar(LLUUID agentID);

         RegionInfo GetRegionInfo();

     }

 }

diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/Common/OpenSim.Framework/OpenSim.Framework.csproj
index 519d5a8..6c2a8c6 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/Common/OpenSim.Framework/OpenSim.Framework.csproj
@@ -110,6 +110,7 @@
     </Compile>

     <Compile Include="SimProfile.cs" />

     <Compile Include="SimProfileBase.cs" />

+    <Compile Include="Types\AgentWearable.cs" />

     <Compile Include="Types\NetworkServersInfo.cs" />

     <Compile Include="UserProfile.cs">

       <SubType>Code</SubType>

diff --git a/Common/OpenSim.Framework/Types/AgentWearable.cs b/Common/OpenSim.Framework/Types/AgentWearable.cs
new file mode 100644
index 0000000..b7fbe3c
--- /dev/null
+++ b/Common/OpenSim.Framework/Types/AgentWearable.cs
@@ -0,0 +1,18 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+using libsecondlife;

+

+namespace OpenSim.Framework.Types

+{

+    public class AvatarWearable

+    {

+        public LLUUID AssetID = new LLUUID("00000000-0000-0000-0000-000000000000");

+        public LLUUID ItemID = new LLUUID("00000000-0000-0000-0000-000000000000");

+

+        public AvatarWearable()

+        {

+

+        }

+    }

+}