diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 16 |
1 files changed, 10 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 704ff15..10ddf14 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
| @@ -790,9 +790,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 790 | 790 | ||
| 791 | // We will launch the teleport on a new thread so that when the script threads are terminated | 791 | // We will launch the teleport on a new thread so that when the script threads are terminated |
| 792 | // before teleport in ScriptInstance.GetXMLState(), we don't end up aborting the one doing the teleporting. | 792 | // before teleport in ScriptInstance.GetXMLState(), we don't end up aborting the one doing the teleporting. |
| 793 | Util.FireAndForget(o => World.RequestTeleportLocation( | 793 | Util.FireAndForget( |
| 794 | presence.ControllingClient, regionName, position, | 794 | o => World.RequestTeleportLocation( |
| 795 | lookat, (uint)TPFlags.ViaLocation)); | 795 | presence.ControllingClient, regionName, position, |
| 796 | lookat, (uint)TPFlags.ViaLocation), | ||
| 797 | null, "OSSL_Api.TeleportAgentByRegionCoords"); | ||
| 796 | 798 | ||
| 797 | ScriptSleep(5000); | 799 | ScriptSleep(5000); |
| 798 | 800 | ||
| @@ -836,9 +838,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 836 | 838 | ||
| 837 | // We will launch the teleport on a new thread so that when the script threads are terminated | 839 | // We will launch the teleport on a new thread so that when the script threads are terminated |
| 838 | // before teleport in ScriptInstance.GetXMLState(), we don't end up aborting the one doing the teleporting. | 840 | // before teleport in ScriptInstance.GetXMLState(), we don't end up aborting the one doing the teleporting. |
| 839 | Util.FireAndForget(o => World.RequestTeleportLocation( | 841 | Util.FireAndForget( |
| 840 | presence.ControllingClient, regionHandle, | 842 | o => World.RequestTeleportLocation( |
| 841 | position, lookat, (uint)TPFlags.ViaLocation)); | 843 | presence.ControllingClient, regionHandle, |
| 844 | position, lookat, (uint)TPFlags.ViaLocation), | ||
| 845 | null, "OSSL_Api.TeleportAgentByRegionName"); | ||
| 842 | 846 | ||
| 843 | ScriptSleep(5000); | 847 | ScriptSleep(5000); |
| 844 | 848 | ||