Initial update to OpenSim 0.8.2.1 source code.

1 files changed, 20 insertions, 10 deletions

diff --git a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
index 69be83e..d07b15a 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
@@ -35,6 +35,8 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.Framework.Interfaces
 {
+    public delegate ScenePresence CrossAgentToNewRegionDelegate(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying, EntityTransferContext ctx);
+
     public interface IEntityTransferModule
     {
         /// <summary>
@@ -45,13 +47,22 @@ namespace OpenSim.Region.Framework.Interfaces
         /// The handle of the destination region.  If it's the same as the region currently
         /// occupied by the agent then the teleport will be within that region.
         /// </param>
+        /// <param name='agent'></param>
+        /// <param name='regionHandle'></param>
         /// <param name='position'></param>
         /// <param name='lookAt'></param>
         /// <param name='teleportFlags'></param>
         void Teleport(ScenePresence agent, ulong regionHandle, Vector3 position, Vector3 lookAt, uint teleportFlags);
 
         /// <summary>
-        /// Teleport an agent directly to a given region without checking whether the region should be subsituted.
+        /// Teleports the agent for the given client to their home destination.
+        /// </summary>
+        /// <param name='id'></param>
+        /// <param name='client'></param>
+        bool TeleportHome(UUID id, IClientAPI client);
+
+        /// <summary>
+        /// Teleport an agent directly to a given region without checking whether the region should be substituted.
         /// </summary>
         /// <remarks>
         /// Please use Teleport() instead unless you know exactly what you're doing.
@@ -63,18 +74,10 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name='position'></param>
         /// <param name='lookAt'></param>
         /// <param name='teleportFlags'></param>
-        void DoTeleport(
-            ScenePresence sp, GridRegion reg, GridRegion finalDestination,
+        void DoTeleport(ScenePresence sp, GridRegion reg, GridRegion finalDestination,
             Vector3 position, Vector3 lookAt, uint teleportFlags);
 
         /// <summary>
-        /// Teleports the agent for the given client to their home destination.
-        /// </summary>
-        /// <param name='id'></param>
-        /// <param name='client'></param>
-        void TeleportHome(UUID id, IClientAPI client);
-
-        /// <summary>
         /// Show whether the given agent is being teleported.
         /// </summary>
         /// <param name='id'>The agent ID</para></param>
@@ -89,7 +92,14 @@ namespace OpenSim.Region.Framework.Interfaces
 
         void EnableChildAgent(ScenePresence agent, GridRegion region);
 
+        GridRegion GetDestination(Scene scene, UUID agentID, Vector3 pos, EntityTransferContext ctx,
+                                        out Vector3 newpos, out string reason);
+
         void Cross(SceneObjectGroup sog, Vector3 position, bool silent);
+
+        ScenePresence CrossAgentToNewRegionAsync(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying, EntityTransferContext ctx);
+
+        bool HandleIncomingSceneObject(SceneObjectGroup so, Vector3 newPosition);
     }
 
     public interface IUserAgentVerificationModule