Route logins according to Estate, Telehub and TeleportFlags

0.7.3-post-fixes
BlueWall 2012-02-18 00:45:43 -05:00
parent 86e8a56fe1
commit 49c65279fa
1 changed files with 4 additions and 2 deletions

View File

@ -3431,8 +3431,10 @@ namespace OpenSim.Region.Framework.Scenes
}
}
// Honor Estate teleport routing via Telehubs
if (RegionInfo.RegionSettings.TelehubObject != UUID.Zero && RegionInfo.EstateSettings.AllowDirectTeleport == false && !viahome && !godlike)
// Honor Estate teleport routing via Telehubs excluding ViaHome and GodLike TeleportFlags
if (RegionInfo.RegionSettings.TelehubObject != UUID.Zero &&
RegionInfo.EstateSettings.AllowDirectTeleport == false &&
!viahome && !godlike)
{
SceneObjectGroup telehub = GetSceneObjectGroup(RegionInfo.RegionSettings.TelehubObject);
// Can have multiple SpawnPoints