4 files changed, 24 insertions, 6 deletions

diff --git a/OpenSim/Framework/General/IRegionCommsListener.cs b/OpenSim/Framework/General/IRegionCommsListener.cs
index 81da5d4..b746671 100644
--- a/OpenSim/Framework/General/IRegionCommsListener.cs
+++ b/OpenSim/Framework/General/IRegionCommsListener.cs
@@ -34,13 +34,15 @@ namespace OpenSim.Framework
 {
     public delegate void ExpectUserDelegate(ulong regionHandle, AgentCircuitData agent);
     public delegate void UpdateNeighbours(List<RegionInfo> neighbours);
-    public delegate void AgentCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position);
+    public delegate void AgentCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying);
+    public delegate void AcknowledgeAgentCross(ulong regionHandle, LLUUID agentID);
 
     public interface IRegionCommsListener
     {
         event ExpectUserDelegate OnExpectUser;
         event GenericCall2 OnExpectChildAgent;
         event AgentCrossing OnAvatarCrossingIntoRegion;
+        event AcknowledgeAgentCross OnAcknowledgeAgentCrossed;
         event UpdateNeighbours OnNeighboursUpdate;
     }
 }
diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
index df65027..c2af2f4 100644
--- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs
+++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
@@ -81,8 +81,9 @@ namespace OpenSim.Framework.Interfaces
     public delegate void AddNewPrim(LLUUID ownerID, LLVector3 pos, PrimitiveBaseShape shape);
 
     public delegate void CreateInventoryFolder(IClientAPI remoteClient, LLUUID folderID, ushort folderType, string folderName, LLUUID parentID);
+    public delegate void CreateNewInventoryItem(IClientAPI remoteClient, LLUUID transActionID, LLUUID folderID, uint callbackID, string description, string name, sbyte invType, sbyte type, byte wearableType, uint nextOwnerMask);
     public delegate void FetchInventoryDescendents(IClientAPI remoteClient, LLUUID folderID, LLUUID ownerID, bool fetchFolders, bool fetchItems, int sortOrder);
-
+    public delegate void FetchInventory(IClientAPI remoteClient, LLUUID itemID, LLUUID ownerID);
     public delegate void RequestTaskInventory(IClientAPI remoteClient, uint localID);
 
     public interface IClientAPI
@@ -128,8 +129,10 @@ namespace OpenSim.Framework.Interfaces
         event NewAvatar OnNewAvatar;
         event GenericCall6 OnRemoveAvatar;
 
+        event CreateNewInventoryItem OnCreateNewInventoryItem;
         event CreateInventoryFolder OnCreateNewInventoryFolder;
         event FetchInventoryDescendents OnFetchInventoryDescendents;
+        event FetchInventory OnFetchInventory;
         event RequestTaskInventory OnRequestTaskInventory;
 
         event UUIDNameRequest OnNameFromUUIDRequest;
@@ -194,7 +197,7 @@ namespace OpenSim.Framework.Interfaces
         void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLQuaternion rotation);
     
         void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, List<InventoryItemBase> items);
-        void SendInventoryItemDetails(LLUUID ownerID, LLUUID folderID, InventoryItemBase item);
+        void SendInventoryItemDetails(LLUUID ownerID, InventoryItemBase item);
         void SendInventoryItemUpdate(InventoryItemBase Item);
         void SendTaskInventory(LLUUID taskID, short serial, byte[] fileName);
 
diff --git a/OpenSim/Framework/General/NullClientAPI.cs b/OpenSim/Framework/General/NullClientAPI.cs
index 18ac527..1b42064 100644
--- a/OpenSim/Framework/General/NullClientAPI.cs
+++ b/OpenSim/Framework/General/NullClientAPI.cs
@@ -52,8 +52,10 @@ namespace OpenSim.Framework
        public event NewAvatar OnNewAvatar;

        public event GenericCall6 OnRemoveAvatar;

 

+       public event CreateNewInventoryItem OnCreateNewInventoryItem;

        public event CreateInventoryFolder OnCreateNewInventoryFolder;

        public event FetchInventoryDescendents OnFetchInventoryDescendents;

+       public event FetchInventory OnFetchInventory;

        public event RequestTaskInventory OnRequestTaskInventory;

 

        public event UUIDNameRequest OnNameFromUUIDRequest;

@@ -127,7 +129,7 @@ namespace OpenSim.Framework
        public virtual void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLQuaternion rotation){}

 

        public virtual void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, List<InventoryItemBase> items){}

-       public virtual void SendInventoryItemDetails(LLUUID ownerID, LLUUID folderID, InventoryItemBase item){}

+       public virtual void SendInventoryItemDetails(LLUUID ownerID, InventoryItemBase item){}

        public virtual void SendInventoryItemUpdate(InventoryItemBase Item) { }

        public virtual void SendTaskInventory(LLUUID taskID, short serial, byte[] fileName) { }

 

diff --git a/OpenSim/Framework/General/RegionCommsListener.cs b/OpenSim/Framework/General/RegionCommsListener.cs
index f5b8272..f7edb7e 100644
--- a/OpenSim/Framework/General/RegionCommsListener.cs
+++ b/OpenSim/Framework/General/RegionCommsListener.cs
@@ -39,6 +39,7 @@ namespace OpenSim.Framework
         public event GenericCall2 OnExpectChildAgent;
         public event AgentCrossing OnAvatarCrossingIntoRegion;
         public event UpdateNeighbours OnNeighboursUpdate;
+        public event AcknowledgeAgentCross OnAcknowledgeAgentCrossed;
 
         /// <summary>
         /// 
@@ -57,11 +58,21 @@ namespace OpenSim.Framework
             return false;
         }
 
-        public virtual bool TriggerExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position)
+        public virtual bool TriggerExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying)
         {
             if (OnAvatarCrossingIntoRegion != null)
             {
-                OnAvatarCrossingIntoRegion(regionHandle, agentID, position);
+                OnAvatarCrossingIntoRegion(regionHandle, agentID, position, isFlying);
+                return true;
+            }
+            return false;
+        }
+
+        public virtual bool TriggerAcknowledgeAgentCrossed(ulong regionHandle, LLUUID agentID)
+        {
+            if (OnAcknowledgeAgentCrossed != null)
+            {
+                OnAcknowledgeAgentCrossed(regionHandle, agentID);
                 return true;
             }
             return false;