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 6a742c1..9fea2a0 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3009,15 +3009,16 @@ namespace OpenSim.Region.Framework.Scenes
3009 /// </summary> 3009 /// </summary>
3010 /// <param name="agentId">The avatar's Unique ID</param> 3010 /// <param name="agentId">The avatar's Unique ID</param>
3011 /// <param name="client">The IClientAPI for the client</param> 3011 /// <param name="client">The IClientAPI for the client</param>
3012 public virtual void TeleportClientHome(UUID agentId, IClientAPI client) 3012 public virtual bool TeleportClientHome(UUID agentId, IClientAPI client)
3013 { 3013 {
3014 if (m_teleportModule != null) 3014 if (m_teleportModule != null)
3015 m_teleportModule.TeleportHome(agentId, client); 3015 return m_teleportModule.TeleportHome(agentId, client);
3016 else 3016 else
3017 { 3017 {
3018 m_log.DebugFormat("[SCENE]: Unable to teleport user home: no AgentTransferModule is active"); 3018 m_log.DebugFormat("[SCENE]: Unable to teleport user home: no AgentTransferModule is active");
3019 client.SendTeleportFailed("Unable to perform teleports on this simulator."); 3019 client.SendTeleportFailed("Unable to perform teleports on this simulator.");
3020 } 3020 }
3021 return false;
3021 } 3022 }
3022 3023
3023 /// <summary> 3024 /// <summary>