aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorBlueWall2012-02-18 00:32:09 -0500
committerBlueWall2012-02-18 00:32:09 -0500
commit7bdcf9eb26842af57e31f3cecd4f403a39a27bc0 (patch)
tree1b09fefccc8fde9afb3bbc052358ef3a6ffbdefb /OpenSim/Region
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-7bdcf9eb26842af57e31f3cecd4f403a39a27bc0.zip
opensim-SC_OLD-7bdcf9eb26842af57e31f3cecd4f403a39a27bc0.tar.gz
opensim-SC_OLD-7bdcf9eb26842af57e31f3cecd4f403a39a27bc0.tar.bz2
opensim-SC_OLD-7bdcf9eb26842af57e31f3cecd4f403a39a27bc0.tar.xz
Propagate our teleport flags on logins
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index ecc553d..841be96 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3261,6 +3261,9 @@ namespace OpenSim.Region.Framework.Scenes
3261 { 3261 {
3262 bool vialogin = ((teleportFlags & (uint)Constants.TeleportFlags.ViaLogin) != 0 || 3262 bool vialogin = ((teleportFlags & (uint)Constants.TeleportFlags.ViaLogin) != 0 ||
3263 (teleportFlags & (uint)Constants.TeleportFlags.ViaHGLogin) != 0); 3263 (teleportFlags & (uint)Constants.TeleportFlags.ViaHGLogin) != 0);
3264 bool viahome = ((teleportFlags & (uint)Constants.TeleportFlags.ViaHome) != 0);
3265 bool godlike = ((teleportFlags & (uint)Constants.TeleportFlags.Godlike) != 0);
3266
3264 reason = String.Empty; 3267 reason = String.Empty;
3265 3268
3266 //Teleport flags: 3269 //Teleport flags:
@@ -3429,7 +3432,7 @@ namespace OpenSim.Region.Framework.Scenes
3429 } 3432 }
3430 3433
3431 // Honor Estate teleport routing via Telehubs 3434 // Honor Estate teleport routing via Telehubs
3432 if (RegionInfo.RegionSettings.TelehubObject != UUID.Zero && RegionInfo.EstateSettings.AllowDirectTeleport == false) 3435 if (RegionInfo.RegionSettings.TelehubObject != UUID.Zero && RegionInfo.EstateSettings.AllowDirectTeleport == false && !viahome && !godlike)
3433 { 3436 {
3434 SceneObjectGroup telehub = GetSceneObjectGroup(RegionInfo.RegionSettings.TelehubObject); 3437 SceneObjectGroup telehub = GetSceneObjectGroup(RegionInfo.RegionSettings.TelehubObject);
3435 // Can have multiple SpawnPoints 3438 // Can have multiple SpawnPoints