aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs5
2 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
index e8738c4..45ca5c5 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Region.Framework.Interfaces
40 void Teleport(ScenePresence agent, ulong regionHandle, Vector3 position, 40 void Teleport(ScenePresence agent, ulong regionHandle, Vector3 position,
41 Vector3 lookAt, uint teleportFlags); 41 Vector3 lookAt, uint teleportFlags);
42 42
43 void TeleportHome(UUID id, IClientAPI client); 43 bool TeleportHome(UUID id, IClientAPI client);
44 44
45 void Cross(ScenePresence agent, bool isFlying); 45 void Cross(ScenePresence agent, bool isFlying);
46 46
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 957c4e8..736b696 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2985,15 +2985,16 @@ namespace OpenSim.Region.Framework.Scenes
2985 /// </summary> 2985 /// </summary>
2986 /// <param name="agentId">The avatar's Unique ID</param> 2986 /// <param name="agentId">The avatar's Unique ID</param>
2987 /// <param name="client">The IClientAPI for the client</param> 2987 /// <param name="client">The IClientAPI for the client</param>
2988 public virtual void TeleportClientHome(UUID agentId, IClientAPI client) 2988 public virtual bool TeleportClientHome(UUID agentId, IClientAPI client)
2989 { 2989 {
2990 if (m_teleportModule != null) 2990 if (m_teleportModule != null)
2991 m_teleportModule.TeleportHome(agentId, client); 2991 return m_teleportModule.TeleportHome(agentId, client);
2992 else 2992 else
2993 { 2993 {
2994 m_log.DebugFormat("[SCENE]: Unable to teleport user home: no AgentTransferModule is active"); 2994 m_log.DebugFormat("[SCENE]: Unable to teleport user home: no AgentTransferModule is active");
2995 client.SendTeleportFailed("Unable to perform teleports on this simulator."); 2995 client.SendTeleportFailed("Unable to perform teleports on this simulator.");
2996 } 2996 }
2997 return false;
2997 } 2998 }
2998 2999
2999 /// <summary> 3000 /// <summary>