diff options
| author | Melanie | 2011-01-27 07:07:33 +0100 |
|---|---|---|
| committer | Melanie | 2011-01-27 07:07:33 +0100 |
| commit | b13eac99963bf4db480f13429895b0131ea07a29 (patch) | |
| tree | a15526bc27fd91159ca5e840f7adbea91e24d3d7 /OpenSim/Region/Framework/Scenes | |
| parent | Let gods TP in wherever they like while in god mode (diff) | |
| download | opensim-SC_OLD-b13eac99963bf4db480f13429895b0131ea07a29.zip opensim-SC_OLD-b13eac99963bf4db480f13429895b0131ea07a29.tar.gz opensim-SC_OLD-b13eac99963bf4db480f13429895b0131ea07a29.tar.bz2 opensim-SC_OLD-b13eac99963bf4db480f13429895b0131ea07a29.tar.xz | |
Make the estate setting "Allow direct teleport" override the constraint
of local tepeports to landing points like it is meant to
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 1925daa..db9a95b 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -4426,6 +4426,9 @@ if (m_animator.m_jumping) force.Z = m_animator.m_jumpVelocity; // add for ju | |||
| 4426 | if ((TeleportFlags & TeleportFlags.ViaLure) != 0) | 4426 | if ((TeleportFlags & TeleportFlags.ViaLure) != 0) |
| 4427 | return; | 4427 | return; |
| 4428 | 4428 | ||
| 4429 | if (m_scene.RegionInfo.EstateSettings.AllowDirectTeleport) | ||
| 4430 | return; | ||
| 4431 | |||
| 4429 | ILandObject land = m_scene.LandChannel.GetLandObject(pos.X, pos.Y); | 4432 | ILandObject land = m_scene.LandChannel.GetLandObject(pos.X, pos.Y); |
| 4430 | 4433 | ||
| 4431 | if (land.LandData.LandingType == (byte)LandingType.LandingPoint && | 4434 | if (land.LandData.LandingType == (byte)LandingType.LandingPoint && |