Let gods TP in wherever they like while in god mode

avinationmerge
Melanie 2011-01-27 07:03:43 +01:00
parent 8568c6a7c0
commit 2a9e712cb4
1 changed files with 1 additions and 0 deletions

View File

@ -962,6 +962,7 @@ namespace OpenSim.Region.Framework.Scenes
// the TP point. This behaviour mimics agni.
if (land.LandData.LandingType == (byte)LandingType.LandingPoint &&
land.LandData.UserLocation != Vector3.Zero &&
GodLevel < 200 &&
((land.LandData.OwnerID != m_uuid &&
(!m_scene.Permissions.IsGod(m_uuid)) &&
(!m_scene.RegionInfo.EstateSettings.IsEstateManager(m_uuid))) || (m_teleportFlags & TeleportFlags.ViaLocation) != 0))