diff options
author | Diva Canto | 2010-08-16 11:33:59 -0700 |
---|---|---|
committer | Diva Canto | 2010-08-16 11:33:59 -0700 |
commit | 77de28965ae5fc6de3c60a28ce7d4e59643a2a70 (patch) | |
tree | 61259b696fb8d8a47f10cb83a72d1df145953b8f /OpenSim/Region/ScriptEngine/Shared | |
parent | Increased the timeout on AgentUpdate to 30 sec and improved error message to ... (diff) | |
download | opensim-SC_OLD-77de28965ae5fc6de3c60a28ce7d4e59643a2a70.zip opensim-SC_OLD-77de28965ae5fc6de3c60a28ce7d4e59643a2a70.tar.gz opensim-SC_OLD-77de28965ae5fc6de3c60a28ce7d4e59643a2a70.tar.bz2 opensim-SC_OLD-77de28965ae5fc6de3c60a28ce7d4e59643a2a70.tar.xz |
Work on TeleportStart: renamed method from TeleportLocationStart to TeleportStart, and now sending this upon all teleports, not just some, and in the right place (EntityTransferModule).
Diffstat (limited to '')
-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 32e46ec..b21e532 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -4070,7 +4070,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4070 | if (m_host.OwnerID == World.LandChannel.GetLandObject( | 4070 | if (m_host.OwnerID == World.LandChannel.GetLandObject( |
4071 | presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID) | 4071 | presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID) |
4072 | { | 4072 | { |
4073 | presence.ControllingClient.SendTeleportLocationStart(); | ||
4074 | World.TeleportClientHome(agentId, presence.ControllingClient); | 4073 | World.TeleportClientHome(agentId, presence.ControllingClient); |
4075 | } | 4074 | } |
4076 | } | 4075 | } |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 01b64eb..a529a94 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -664,7 +664,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
664 | regionName = regInfo.RegionName; | 664 | regionName = regInfo.RegionName; |
665 | } | 665 | } |
666 | } | 666 | } |
667 | presence.ControllingClient.SendTeleportLocationStart(); | ||
668 | World.RequestTeleportLocation(presence.ControllingClient, regionName, | 667 | World.RequestTeleportLocation(presence.ControllingClient, regionName, |
669 | new Vector3((float)position.x, (float)position.y, (float)position.z), | 668 | new Vector3((float)position.x, (float)position.y, (float)position.z), |
670 | new Vector3((float)lookat.x, (float)lookat.y, (float)lookat.z), (uint)TPFlags.ViaLocation); | 669 | new Vector3((float)lookat.x, (float)lookat.y, (float)lookat.z), (uint)TPFlags.ViaLocation); |
@@ -696,7 +695,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
696 | == World.LandChannel.GetLandObject( | 695 | == World.LandChannel.GetLandObject( |
697 | presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID) | 696 | presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID) |
698 | { | 697 | { |
699 | presence.ControllingClient.SendTeleportLocationStart(); | ||
700 | World.RequestTeleportLocation(presence.ControllingClient, regionHandle, | 698 | World.RequestTeleportLocation(presence.ControllingClient, regionHandle, |
701 | new Vector3((float)position.x, (float)position.y, (float)position.z), | 699 | new Vector3((float)position.x, (float)position.y, (float)position.z), |
702 | new Vector3((float)lookat.x, (float)lookat.y, (float)lookat.z), (uint)TPFlags.ViaLocation); | 700 | new Vector3((float)lookat.x, (float)lookat.y, (float)lookat.z), (uint)TPFlags.ViaLocation); |