From 2a9e712cb4381c585505cbe5aa98092a41a617b5 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 27 Jan 2011 07:03:43 +0100
Subject: Let gods TP in wherever they like while in god mode

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'OpenSim/Region/Framework')

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
                     // 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))
-- 
cgit v1.1