aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
diff options
context:
space:
mode:
authorRobert Adams2014-02-15 17:02:53 -0800
committerRobert Adams2014-02-15 17:02:53 -0800
commit7fc289c039ca3cdbad0f050e17c1b1d13e684c73 (patch)
treeb03784f877703368750cd8d75ddeb148d810101f /OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
parentRewrite of mega-region code to use new form of border checking. (diff)
downloadopensim-SC_OLD-7fc289c039ca3cdbad0f050e17c1b1d13e684c73.zip
opensim-SC_OLD-7fc289c039ca3cdbad0f050e17c1b1d13e684c73.tar.gz
opensim-SC_OLD-7fc289c039ca3cdbad0f050e17c1b1d13e684c73.tar.bz2
opensim-SC_OLD-7fc289c039ca3cdbad0f050e17c1b1d13e684c73.tar.xz
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.
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs')
-rw-r--r--OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs5
1 files changed, 3 insertions, 2 deletions
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
92 92
93 void EnableChildAgent(ScenePresence agent, GridRegion region); 93 void EnableChildAgent(ScenePresence agent, GridRegion region);
94 94
95 GridRegion GetDestination(Scene scene, UUID agentID, Vector3 pos, out string version, out Vector3 newpos); 95 GridRegion GetDestination(Scene scene, UUID agentID, Vector3 pos, out string version,
96 out Vector3 newpos, out string reason);
96 97
97 void Cross(SceneObjectGroup sog, Vector3 position, bool silent); 98 void Cross(SceneObjectGroup sog, Vector3 position, bool silent);
98 99
99 ScenePresence CrossAgentToNewRegionAsync(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying, string version); 100 ScenePresence CrossAgentToNewRegionAsync(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying, string version);
100 } 101 }
101 102
102 public interface IUserAgentVerificationModule 103 public interface IUserAgentVerificationModule