3 files changed, 15 insertions, 3 deletions

diff --git a/Common/OpenSim.Framework/IRegionCommsHost.cs b/Common/OpenSim.Framework/IRegionCommsHost.cs
index aa434c5..658afe6 100644
--- a/Common/OpenSim.Framework/IRegionCommsHost.cs
+++ b/Common/OpenSim.Framework/IRegionCommsHost.cs
@@ -35,12 +35,13 @@ namespace OpenSim.Framework
 {

     public delegate void ExpectUserDelegate(ulong regionHandle, AgentCircuitData agent);

     public delegate void UpdateNeighbours(List<RegionInfo> neighbours);

+    public delegate void AgentCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position);

 

     public interface IRegionCommsHost

     {

         event ExpectUserDelegate OnExpectUser;

         event GenericCall2 OnExpectChildAgent;

-        event GenericCall2 OnAvatarCrossingIntoRegion;

+        event AgentCrossing OnAvatarCrossingIntoRegion;

         event UpdateNeighbours OnNeighboursUpdate;

     }

 }

diff --git a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
index cebfd9a..45d73ef 100644
--- a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
+++ b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
@@ -125,9 +125,10 @@ namespace OpenSim.Framework.Interfaces
         void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);

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

         void SendLayerData(float[] map);

-        void MoveAgentIntoRegion(RegionInfo regInfo);

+        void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos);

         void InformClientOfNeighbour(ulong neighbourHandle, System.Net.IPAddress neighbourIP, ushort neighbourPort);

         AgentCircuitData RequestClientInfo();

+        void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, System.Net.IPAddress newRegionIP, ushort newRegionPort);

 

         void SendAvatarData(RegionInfo regionInfo, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos);

         void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLVector3 velocity);

diff --git a/Common/OpenSim.Framework/RegionCommsHostBase.cs b/Common/OpenSim.Framework/RegionCommsHostBase.cs
index 6a08eb8..88751b8 100644
--- a/Common/OpenSim.Framework/RegionCommsHostBase.cs
+++ b/Common/OpenSim.Framework/RegionCommsHostBase.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Framework
     {

         public event ExpectUserDelegate OnExpectUser;

         public event GenericCall2 OnExpectChildAgent;

-        public event GenericCall2 OnAvatarCrossingIntoRegion;

+        public event AgentCrossing OnAvatarCrossingIntoRegion;

         public event UpdateNeighbours OnNeighboursUpdate;

 

         /// <summary>

@@ -55,5 +55,15 @@ namespace OpenSim.Framework
 

             return false;

         }

+

+        public virtual bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)

+        {

+            if (OnAvatarCrossingIntoRegion != null)

+            {

+                OnAvatarCrossingIntoRegion(regionHandle, agentID, position);

+                return true;

+            }

+            return false;

+        }

     }

 }