diff options
| author | onefang | 2019-08-15 04:36:20 +1000 |
|---|---|---|
| committer | onefang | 2019-08-15 04:36:20 +1000 |
| commit | 981a407bbe5ce17445fb8b2d7d4816a9e7cb5ae0 (patch) | |
| tree | 63cab548fb61b28b766a15b389aac69b02872c1c | |
| parent | Bandaid for ghost users, check and remove them from Presence when they log on. (diff) | |
| download | opensim-SC-981a407bbe5ce17445fb8b2d7d4816a9e7cb5ae0.zip opensim-SC-981a407bbe5ce17445fb8b2d7d4816a9e7cb5ae0.tar.gz opensim-SC-981a407bbe5ce17445fb8b2d7d4816a9e7cb5ae0.tar.bz2 opensim-SC-981a407bbe5ce17445fb8b2d7d4816a9e7cb5ae0.tar.xz | |
Teleport home from off grid shouldn't land on roofs either.
| -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 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; |