From 7fc289c039ca3cdbad0f050e17c1b1d13e684c73 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sat, 15 Feb 2014 17:02:53 -0800
Subject: Properly restore position on crossing failure for mega-regions. Fix
 odd "cannot cross into banned parcel" viewer error message when crossing into
 non-existant region. Proper permission failure messages are now returned.

---
 OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs')

diff --git a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
index 709d8fc..5d07a5f 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
@@ -92,11 +92,12 @@ namespace OpenSim.Region.Framework.Interfaces
 
         void EnableChildAgent(ScenePresence agent, GridRegion region);
 
-        GridRegion GetDestination(Scene scene, UUID agentID, Vector3 pos, out string version, out Vector3 newpos);
+        GridRegion GetDestination(Scene scene, UUID agentID, Vector3 pos, out string version,
+                                        out Vector3 newpos, out string reason);
 
         void Cross(SceneObjectGroup sog, Vector3 position, bool silent);
 
-        ScenePresence CrossAgentToNewRegionAsync(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying, string version);
+        ScenePresence CrossAgentToNewRegionAsync(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying, string version);
     }
 
     public interface IUserAgentVerificationModule
-- 
cgit v1.1