aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorMelanie Thielker2010-08-31 22:26:17 +0200
committerMelanie Thielker2010-08-31 22:26:17 +0200
commitaca10cb027d3184788bc61e67fe26db85f9e748c (patch)
treecb6a7d3b806143d1c60252602befa07a211e9d72 /OpenSim/Region/Framework/Scenes/Scene.cs
parentAdjust the "Magic numbers" we use because we can't reference the actual (diff)
parentMerge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
downloadopensim-SC-aca10cb027d3184788bc61e67fe26db85f9e748c.zip
opensim-SC-aca10cb027d3184788bc61e67fe26db85f9e748c.tar.gz
opensim-SC-aca10cb027d3184788bc61e67fe26db85f9e748c.tar.bz2
opensim-SC-aca10cb027d3184788bc61e67fe26db85f9e748c.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 767d370..b950dbd 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>