aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorBlueWall2012-02-18 00:45:43 -0500
committerBlueWall2012-02-18 00:45:43 -0500
commitf4cd35322f59b7aae548595541abaa80deefc74d (patch)
treed5b653867c6a94a2c2c78d406e6cbb17dde7df00 /OpenSim
parentPropagate our teleport flags on logins (diff)
downloadopensim-SC_OLD-f4cd35322f59b7aae548595541abaa80deefc74d.zip
opensim-SC_OLD-f4cd35322f59b7aae548595541abaa80deefc74d.tar.gz
opensim-SC_OLD-f4cd35322f59b7aae548595541abaa80deefc74d.tar.bz2
opensim-SC_OLD-f4cd35322f59b7aae548595541abaa80deefc74d.tar.xz
Route logins according to Estate, Telehub and TeleportFlags
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 841be96..13c866d 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3431,8 +3431,10 @@ namespace OpenSim.Region.Framework.Scenes
3431 } 3431 }
3432 } 3432 }
3433 3433
3434 // Honor Estate teleport routing via Telehubs 3434 // Honor Estate teleport routing via Telehubs excluding ViaHome and GodLike TeleportFlags
3435 if (RegionInfo.RegionSettings.TelehubObject != UUID.Zero && RegionInfo.EstateSettings.AllowDirectTeleport == false && !viahome && !godlike) 3435 if (RegionInfo.RegionSettings.TelehubObject != UUID.Zero &&
3436 RegionInfo.EstateSettings.AllowDirectTeleport == false &&
3437 !viahome && !godlike)
3436 { 3438 {
3437 SceneObjectGroup telehub = GetSceneObjectGroup(RegionInfo.RegionSettings.TelehubObject); 3439 SceneObjectGroup telehub = GetSceneObjectGroup(RegionInfo.RegionSettings.TelehubObject);
3438 // Can have multiple SpawnPoints 3440 // Can have multiple SpawnPoints