From 1df67a37dcab61d22516cd2aeb6b895e703d49b8 Mon Sep 17 00:00:00 2001
From: Homer Horwitz
Date: Thu, 6 Nov 2008 20:38:34 +0000
Subject: 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.

---
 OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs  | 3 +++
 OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 1 +
 2 files changed, 4 insertions(+)

(limited to 'OpenSim/Region')

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
                 {
                     // agent must be over the owners land
                     if (m_host.OwnerID == World.GetLandOwner(presence.AbsolutePosition.X, presence.AbsolutePosition.Y))
+                    {
+                        presence.ControllingClient.SendTeleportLocationStart();
                         World.TeleportClientHome(agentId, presence.ControllingClient);
+                    }
                 }
             }
             // 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
                     // agent must be over owners land to avoid abuse
                     if (m_host.OwnerID == World.GetLandOwner(presence.AbsolutePosition.X, presence.AbsolutePosition.Y))
                     {
+                        presence.ControllingClient.SendTeleportLocationStart();
                         World.RequestTeleportLocation(presence.ControllingClient, regionName,
                             new Vector3((float)position.x, (float)position.y, (float)position.z),
                             new Vector3((float)lookat.x, (float)lookat.y, (float)lookat.z), (uint)TPFlags.ViaLocation);
-- 
cgit v1.1