aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorHomer Horwitz2008-11-06 20:38:34 +0000
committerHomer Horwitz2008-11-06 20:38:34 +0000
commit1df67a37dcab61d22516cd2aeb6b895e703d49b8 (patch)
treeef8492a3d21b47e54d6c0bfda2a9597d7ce1ea46
parent* minor: Make some 'startup config failed to load' log messages more consistent (diff)
downloadopensim-SC-1df67a37dcab61d22516cd2aeb6b895e703d49b8.zip
opensim-SC-1df67a37dcab61d22516cd2aeb6b895e703d49b8.tar.gz
opensim-SC-1df67a37dcab61d22516cd2aeb6b895e703d49b8.tar.bz2
opensim-SC-1df67a37dcab61d22516cd2aeb6b895e703d49b8.tar.xz
Add missing TeleportStart packets to llTeleportAgentHome and osTeleportAgent.
As those aren't viewer-initiated TPs, the viewer has to be informed. This should fix Mantis #2351 and #2397.
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs3
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs1
2 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index eefb8e6..123f98f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -3444,7 +3444,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3444 { 3444 {
3445 // agent must be over the owners land 3445 // agent must be over the owners land
3446 if (m_host.OwnerID == World.GetLandOwner(presence.AbsolutePosition.X, presence.AbsolutePosition.Y)) 3446 if (m_host.OwnerID == World.GetLandOwner(presence.AbsolutePosition.X, presence.AbsolutePosition.Y))
3447 {
3448 presence.ControllingClient.SendTeleportLocationStart();
3447 World.TeleportClientHome(agentId, presence.ControllingClient); 3449 World.TeleportClientHome(agentId, presence.ControllingClient);
3450 }
3448 } 3451 }
3449 } 3452 }
3450 // ScriptSleep(5000); 3453 // ScriptSleep(5000);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index d5225f7..787d951 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -479,6 +479,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
479 // agent must be over owners land to avoid abuse 479 // agent must be over owners land to avoid abuse
480 if (m_host.OwnerID == World.GetLandOwner(presence.AbsolutePosition.X, presence.AbsolutePosition.Y)) 480 if (m_host.OwnerID == World.GetLandOwner(presence.AbsolutePosition.X, presence.AbsolutePosition.Y))
481 { 481 {
482 presence.ControllingClient.SendTeleportLocationStart();
482 World.RequestTeleportLocation(presence.ControllingClient, regionName, 483 World.RequestTeleportLocation(presence.ControllingClient, regionName,
483 new Vector3((float)position.x, (float)position.y, (float)position.z), 484 new Vector3((float)position.x, (float)position.y, (float)position.z),
484 new Vector3((float)lookat.x, (float)lookat.y, (float)lookat.z), (uint)TPFlags.ViaLocation); 485 new Vector3((float)lookat.x, (float)lookat.y, (float)lookat.z), (uint)TPFlags.ViaLocation);