diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 9bece31..e3a69a8 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -4405,7 +4405,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4405 | if (m_host.OwnerID == World.LandChannel.GetLandObject( | 4405 | if (m_host.OwnerID == World.LandChannel.GetLandObject( |
4406 | presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID) | 4406 | presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID) |
4407 | { | 4407 | { |
4408 | presence.ControllingClient.SendTeleportLocationStart(); | ||
4409 | World.TeleportClientHome(agentId, presence.ControllingClient); | 4408 | World.TeleportClientHome(agentId, presence.ControllingClient); |
4410 | } | 4409 | } |
4411 | } | 4410 | } |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 73e87b5..a08b135 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -673,7 +673,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
673 | regionName = regInfo.RegionName; | 673 | regionName = regInfo.RegionName; |
674 | } | 674 | } |
675 | } | 675 | } |
676 | presence.ControllingClient.SendTeleportLocationStart(); | ||
677 | World.RequestTeleportLocation(presence.ControllingClient, regionName, | 676 | World.RequestTeleportLocation(presence.ControllingClient, regionName, |
678 | new Vector3((float)position.x, (float)position.y, (float)position.z), | 677 | new Vector3((float)position.x, (float)position.y, (float)position.z), |
679 | new Vector3((float)lookat.x, (float)lookat.y, (float)lookat.z), (uint)TPFlags.ViaLocation); | 678 | new Vector3((float)lookat.x, (float)lookat.y, (float)lookat.z), (uint)TPFlags.ViaLocation); |
@@ -705,7 +704,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
705 | == World.LandChannel.GetLandObject( | 704 | == World.LandChannel.GetLandObject( |
706 | presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID) | 705 | presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID) |
707 | { | 706 | { |
708 | presence.ControllingClient.SendTeleportLocationStart(); | ||
709 | World.RequestTeleportLocation(presence.ControllingClient, regionHandle, | 707 | World.RequestTeleportLocation(presence.ControllingClient, regionHandle, |
710 | new Vector3((float)position.x, (float)position.y, (float)position.z), | 708 | new Vector3((float)position.x, (float)position.y, (float)position.z), |
711 | new Vector3((float)lookat.x, (float)lookat.y, (float)lookat.z), (uint)TPFlags.ViaLocation); | 709 | new Vector3((float)lookat.x, (float)lookat.y, (float)lookat.z), (uint)TPFlags.ViaLocation); |