Bring us up to date.

1 files changed, 13 insertions, 6 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 0c1da47..8f450f8 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -712,9 +712,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         == World.LandChannel.GetLandObject(
                             presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID)
                     {
-                        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);
+                        // We will launch the teleport on a new thread so that when the script threads are terminated
+                        // before teleport in ScriptInstance.GetXMLState(), we don't end up aborting the one doing the teleporting.                        
+                        Util.FireAndForget(
+                            o => 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));
 
                         ScriptSleep(5000);
                     }
@@ -750,9 +753,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         == World.LandChannel.GetLandObject(
                             presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID)
                     {
-                        World.RequestTeleportLocation(presence.ControllingClient, regionHandle,
-                            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);
+                        // We will launch the teleport on a new thread so that when the script threads are terminated
+                        // before teleport in ScriptInstance.GetXMLState(), we don't end up aborting the one doing the teleporting.
+                        Util.FireAndForget(
+                            o => World.RequestTeleportLocation(presence.ControllingClient, regionHandle,
+                                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));
+
                         ScriptSleep(5000);
                     }
                 }