aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authormeta72010-08-30 11:41:20 -0700
committermeta72010-08-30 11:41:20 -0700
commit4cf5ef3cd4c6712f74615385a03217f5d4cecb80 (patch)
tree2818bcd84b994ccd1076ed4fcf109d0db4f24dda /OpenSim/Region/Framework/Scenes
parentMerge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
downloadopensim-SC-4cf5ef3cd4c6712f74615385a03217f5d4cecb80.zip
opensim-SC-4cf5ef3cd4c6712f74615385a03217f5d4cecb80.tar.gz
opensim-SC-4cf5ef3cd4c6712f74615385a03217f5d4cecb80.tar.bz2
opensim-SC-4cf5ef3cd4c6712f74615385a03217f5d4cecb80.tar.xz
Kick the user from the region in the circumstance that the TP home failed - ONLY if it was triggered by an estate ban. This makes baby jesus cry, and should be fixed to search for alternative regions if the home region is unavailable.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-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 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>