From 5b752dd4b7fd2600157ec90da5051623afe1dc4d Mon Sep 17 00:00:00 2001
From: onefang
Date: Sun, 21 Jul 2019 21:25:11 +1000
Subject: TPs from scripts avoid all that silly raycasting nonsense, just go
 where we ask.

---
 OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs')

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index d897098..2be5200 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -880,7 +880,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 {
                     // should be faster than going to threadpool
                     World.RequestTeleportLocation(presence.ControllingClient, regionName, position,
-                        lookat, (uint)TPFlags.ViaLocation);
+                        lookat, (uint)(TPFlags.ViaLocation | TPFlags.ViaScript));
                 }
                 else
                 {
@@ -889,7 +889,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 Util.FireAndForget(
                     o => World.RequestTeleportLocation(
                         presence.ControllingClient, regionName, position,
-                        lookat, (uint)TPFlags.ViaLocation),
+                        lookat, (uint)(TPFlags.ViaLocation | TPFlags.ViaScript)),
                     null, "OSSL_Api.TeleportAgentByRegionCoords");
                 }
             }
@@ -923,7 +923,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 Util.FireAndForget(
                     o => World.RequestTeleportLocation(
                         presence.ControllingClient, regionHandle,
-                        position, lookat, (uint)TPFlags.ViaLocation),
+                        position, lookat, (uint)(TPFlags.ViaLocation | TPFlags.ViaScript)),
                     null, "OSSL_Api.TeleportAgentByRegionName");
             }
         }
@@ -942,7 +942,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     return;
 
                 World.RequestTeleportLocation(presence.ControllingClient, World.RegionInfo.RegionName, position,
-                    lookat, (uint)TPFlags.ViaLocation);
+                    lookat, (uint)(TPFlags.ViaLocation | TPFlags.ViaScript));
             }
         }
 
-- 
cgit v1.1