diff options
| author | Melanie | 2010-03-15 17:54:39 +0000 |
|---|---|---|
| committer | Melanie | 2010-03-15 17:54:39 +0000 |
| commit | a1cd3b5b88cc2cc3fcd552085dc9ab46f9d9b10f (patch) | |
| tree | df7a44dae0083e6246a957209684769c522c6996 /OpenSim/Region | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| download | opensim-SC_OLD-a1cd3b5b88cc2cc3fcd552085dc9ab46f9d9b10f.zip opensim-SC_OLD-a1cd3b5b88cc2cc3fcd552085dc9ab46f9d9b10f.tar.gz opensim-SC_OLD-a1cd3b5b88cc2cc3fcd552085dc9ab46f9d9b10f.tar.bz2 opensim-SC_OLD-a1cd3b5b88cc2cc3fcd552085dc9ab46f9d9b10f.tar.xz | |
Change GodLevel to UserLevel so gods can teleport freely without having
to enter god mode first
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 24179a9..2661dc3 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -879,7 +879,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 879 | if (land != null) | 879 | if (land != null) |
| 880 | { | 880 | { |
| 881 | //Don't restrict gods, estate managers, or land owners to the TP point. This behaviour mimics agni. | 881 | //Don't restrict gods, estate managers, or land owners to the TP point. This behaviour mimics agni. |
| 882 | if (land.LandData.LandingType == (byte)1 && land.LandData.UserLocation != Vector3.Zero && m_godLevel < 200 && !m_scene.RegionInfo.EstateSettings.IsEstateManager(m_uuid) && land.LandData.OwnerID != m_uuid) | 882 | if (land.LandData.LandingType == (byte)1 && land.LandData.UserLocation != Vector3.Zero && m_userLevel < 200 && !m_scene.RegionInfo.EstateSettings.IsEstateManager(m_uuid) && land.LandData.OwnerID != m_uuid) |
| 883 | { | 883 | { |
| 884 | pos = land.LandData.UserLocation; | 884 | pos = land.LandData.UserLocation; |
| 885 | } | 885 | } |