diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 7a634c4..292dbdc 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -3946,7 +3946,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3946 | land.LandData.UserLocation != Vector3.Zero && | 3946 | land.LandData.UserLocation != Vector3.Zero && |
3947 | land.LandData.OwnerID != m_uuid && | 3947 | land.LandData.OwnerID != m_uuid && |
3948 | (!m_scene.Permissions.IsGod(m_uuid)) && | 3948 | (!m_scene.Permissions.IsGod(m_uuid)) && |
3949 | (!m_scene.RegionInfo.EstateSettings.IsEstateManager(m_uuid))) | 3949 | (!m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_uuid))) |
3950 | { | 3950 | { |
3951 | float curr = Vector3.Distance(AbsolutePosition, pos); | 3951 | float curr = Vector3.Distance(AbsolutePosition, pos); |
3952 | if (Vector3.Distance(land.LandData.UserLocation, pos) < curr) | 3952 | if (Vector3.Distance(land.LandData.UserLocation, pos) < curr) |
@@ -3966,7 +3966,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3966 | { | 3966 | { |
3967 | if (GodLevel < 200 && | 3967 | if (GodLevel < 200 && |
3968 | ((!m_scene.Permissions.IsGod(m_uuid) && | 3968 | ((!m_scene.Permissions.IsGod(m_uuid) && |
3969 | !m_scene.RegionInfo.EstateSettings.IsEstateManager(m_uuid)) || | 3969 | !m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_uuid)) || |
3970 | (m_teleportFlags & TeleportFlags.ViaLocation) != 0 || | 3970 | (m_teleportFlags & TeleportFlags.ViaLocation) != 0 || |
3971 | (m_teleportFlags & Constants.TeleportFlags.ViaHGLogin) != 0)) | 3971 | (m_teleportFlags & Constants.TeleportFlags.ViaHGLogin) != 0)) |
3972 | { | 3972 | { |
@@ -4040,7 +4040,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
4040 | GodLevel < 200 && | 4040 | GodLevel < 200 && |
4041 | ((land.LandData.OwnerID != m_uuid && | 4041 | ((land.LandData.OwnerID != m_uuid && |
4042 | !m_scene.Permissions.IsGod(m_uuid) && | 4042 | !m_scene.Permissions.IsGod(m_uuid) && |
4043 | !m_scene.RegionInfo.EstateSettings.IsEstateManager(m_uuid)) || | 4043 | !m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_uuid)) || |
4044 | (m_teleportFlags & TeleportFlags.ViaLocation) != 0 || | 4044 | (m_teleportFlags & TeleportFlags.ViaLocation) != 0 || |
4045 | (m_teleportFlags & Constants.TeleportFlags.ViaHGLogin) != 0)) | 4045 | (m_teleportFlags & Constants.TeleportFlags.ViaHGLogin) != 0)) |
4046 | { | 4046 | { |