diff options
| author | Melanie | 2011-01-27 07:03:43 +0100 |
|---|---|---|
| committer | Melanie | 2011-01-27 07:03:43 +0100 |
| commit | 2a9e712cb4381c585505cbe5aa98092a41a617b5 (patch) | |
| tree | 6abb5f88734efb491bfa77b1f1da7ed2da5147c5 /OpenSim/Region/Framework/Scenes | |
| parent | Implement "Cannot teleport closer to destination" message (diff) | |
| download | opensim-SC_OLD-2a9e712cb4381c585505cbe5aa98092a41a617b5.zip opensim-SC_OLD-2a9e712cb4381c585505cbe5aa98092a41a617b5.tar.gz opensim-SC_OLD-2a9e712cb4381c585505cbe5aa98092a41a617b5.tar.bz2 opensim-SC_OLD-2a9e712cb4381c585505cbe5aa98092a41a617b5.tar.xz | |
Let gods TP in wherever they like while in god mode
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 5810824..1925daa 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -962,6 +962,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 962 | // the TP point. This behaviour mimics agni. | 962 | // the TP point. This behaviour mimics agni. |
| 963 | if (land.LandData.LandingType == (byte)LandingType.LandingPoint && | 963 | if (land.LandData.LandingType == (byte)LandingType.LandingPoint && |
| 964 | land.LandData.UserLocation != Vector3.Zero && | 964 | land.LandData.UserLocation != Vector3.Zero && |
| 965 | GodLevel < 200 && | ||
| 965 | ((land.LandData.OwnerID != m_uuid && | 966 | ((land.LandData.OwnerID != m_uuid && |
| 966 | (!m_scene.Permissions.IsGod(m_uuid)) && | 967 | (!m_scene.Permissions.IsGod(m_uuid)) && |
| 967 | (!m_scene.RegionInfo.EstateSettings.IsEstateManager(m_uuid))) || (m_teleportFlags & TeleportFlags.ViaLocation) != 0)) | 968 | (!m_scene.RegionInfo.EstateSettings.IsEstateManager(m_uuid))) || (m_teleportFlags & TeleportFlags.ViaLocation) != 0)) |