diff options
| author | BlueWall | 2012-02-18 00:45:43 -0500 |
|---|---|---|
| committer | BlueWall | 2012-02-19 12:41:44 -0500 |
| commit | 49c65279fa8b6233497eed54d430bc350fb30d60 (patch) | |
| tree | 07447f917cde606d5b528011285e3622868f343b /OpenSim/Region/Framework/Scenes | |
| parent | Propagate our teleport flags on logins (diff) | |
| download | opensim-SC_OLD-49c65279fa8b6233497eed54d430bc350fb30d60.zip opensim-SC_OLD-49c65279fa8b6233497eed54d430bc350fb30d60.tar.gz opensim-SC_OLD-49c65279fa8b6233497eed54d430bc350fb30d60.tar.bz2 opensim-SC_OLD-49c65279fa8b6233497eed54d430bc350fb30d60.tar.xz | |
Route logins according to Estate, Telehub and TeleportFlags
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 6 |
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 |