aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authoronefang2019-08-15 04:36:20 +1000
committeronefang2019-08-15 04:36:20 +1000
commit981a407bbe5ce17445fb8b2d7d4816a9e7cb5ae0 (patch)
tree63cab548fb61b28b766a15b389aac69b02872c1c /OpenSim/Region/Framework/Scenes
parentBandaid for ghost users, check and remove them from Presence when they log on. (diff)
downloadopensim-SC_OLD-981a407bbe5ce17445fb8b2d7d4816a9e7cb5ae0.zip
opensim-SC_OLD-981a407bbe5ce17445fb8b2d7d4816a9e7cb5ae0.tar.gz
opensim-SC_OLD-981a407bbe5ce17445fb8b2d7d4816a9e7cb5ae0.tar.bz2
opensim-SC_OLD-981a407bbe5ce17445fb8b2d7d4816a9e7cb5ae0.tar.xz
Teleport home from off grid shouldn't land on roofs either.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 6aa5047..5d311aa 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1374,7 +1374,7 @@ namespace OpenSim.Region.Framework.Scenes
1374 || (m_teleportFlags & TeleportFlags.ViaMap) != 0 1374 || (m_teleportFlags & TeleportFlags.ViaMap) != 0
1375 || (m_teleportFlags & TeleportFlags.ViaHGLogin) != 0); 1375 || (m_teleportFlags & TeleportFlags.ViaHGLogin) != 0);
1376 1376
1377 if(checkPhysics && ((m_teleportFlags & TeleportFlags.ViaScript) == 0)) 1377 if(checkPhysics && ((m_teleportFlags & TeleportFlags.ViaScript) == 0) && ((m_teleportFlags & TeleportFlags.ViaHome) == 0))
1378 { 1378 {
1379 // land check was done above 1379 // land check was done above
1380 RayFilterFlags rayfilter = RayFilterFlags.BackFaceCull; 1380 RayFilterFlags rayfilter = RayFilterFlags.BackFaceCull;