aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2012-01-10 11:10:47 -0800
committerDiva Canto2012-01-10 11:10:47 -0800
commit7b84942f868a0c0d54a9ccb3627434cbf0e91417 (patch)
tree7653495f216727d3911557b80ca0d8b5ae61c5eb /OpenSim
parentHG Friends: fixed bug introduced by 571efeddb20f38bb4164074b3c217be5387ca2e0 ... (diff)
downloadopensim-SC_OLD-7b84942f868a0c0d54a9ccb3627434cbf0e91417.zip
opensim-SC_OLD-7b84942f868a0c0d54a9ccb3627434cbf0e91417.tar.gz
opensim-SC_OLD-7b84942f868a0c0d54a9ccb3627434cbf0e91417.tar.bz2
opensim-SC_OLD-7b84942f868a0c0d54a9ccb3627434cbf0e91417.tar.xz
HG landing points: this hopefully fixes some confusion that was making HG avies always land in 0,0
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs11
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 1869417..3c9bde8 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3851,17 +3851,18 @@ namespace OpenSim.Region.Framework.Scenes
3851 (TeleportFlags.ViaLogin | TeleportFlags.ViaRegionID) || 3851 (TeleportFlags.ViaLogin | TeleportFlags.ViaRegionID) ||
3852 (m_teleportFlags & TeleportFlags.ViaLandmark) != 0 || 3852 (m_teleportFlags & TeleportFlags.ViaLandmark) != 0 ||
3853 (m_teleportFlags & TeleportFlags.ViaLocation) != 0 || 3853 (m_teleportFlags & TeleportFlags.ViaLocation) != 0 ||
3854 ((m_teleportFlags & (TeleportFlags)Constants.TeleportFlags.ViaHGLogin) == (TeleportFlags)Constants.TeleportFlags.ViaHGLogin)) 3854 (m_teleportFlags & Constants.TeleportFlags.ViaHGLogin) != 0)
3855 { 3855 {
3856 // Don't restrict gods, estate managers, or land owners to 3856 // Don't restrict gods, estate managers, or land owners to
3857 // the TP point. This behaviour mimics agni. 3857 // the TP point. This behaviour mimics agni.
3858 if (land.LandData.LandingType == (byte)LandingType.LandingPoint && 3858 if (land.LandData.LandingType == (byte)LandingType.LandingPoint &&
3859 land.LandData.UserLocation != Vector3.Zero && 3859 land.LandData.UserLocation != Vector3.Zero &&
3860 GodLevel < 200 && 3860 GodLevel < 200 &&
3861 ((land.LandData.OwnerID != m_uuid && 3861 ((land.LandData.OwnerID != m_uuid &&
3862 (!m_scene.Permissions.IsGod(m_uuid)) && 3862 !m_scene.Permissions.IsGod(m_uuid) &&
3863 (!m_scene.RegionInfo.EstateSettings.IsEstateManager(m_uuid))) || (m_teleportFlags & TeleportFlags.ViaLocation) != 0) || 3863 !m_scene.RegionInfo.EstateSettings.IsEstateManager(m_uuid)) ||
3864 ((m_teleportFlags & (TeleportFlags)Constants.TeleportFlags.ViaHGLogin) == (TeleportFlags)Constants.TeleportFlags.ViaHGLogin)) 3864 (m_teleportFlags & TeleportFlags.ViaLocation) != 0 ||
3865 (m_teleportFlags & Constants.TeleportFlags.ViaHGLogin) != 0))
3865 { 3866 {
3866 pos = land.LandData.UserLocation; 3867 pos = land.LandData.UserLocation;
3867 } 3868 }