diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 8 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 16 |
2 files changed, 14 insertions, 10 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index e7ba7a4..97e3eeb 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -2979,7 +2979,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2979 | 2979 | ||
2980 | money.ObjectGiveMoney( | 2980 | money.ObjectGiveMoney( |
2981 | m_host.ParentGroup.RootPart.UUID, m_host.ParentGroup.RootPart.OwnerID, toID, amount); | 2981 | m_host.ParentGroup.RootPart.UUID, m_host.ParentGroup.RootPart.OwnerID, toID, amount); |
2982 | }); | 2982 | }, null, "LSL_Api.llGiveMoney"); |
2983 | } | 2983 | } |
2984 | 2984 | ||
2985 | public void llMakeExplosion(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset) | 2985 | public void llMakeExplosion(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset) |
@@ -3075,7 +3075,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3075 | } | 3075 | } |
3076 | // Variable script delay? (see (http://wiki.secondlife.com/wiki/LSL_Delay) | 3076 | // Variable script delay? (see (http://wiki.secondlife.com/wiki/LSL_Delay) |
3077 | } | 3077 | } |
3078 | }); | 3078 | }, null, "LSL_Api.llRezAtRoot"); |
3079 | 3079 | ||
3080 | //ScriptSleep((int)((groupmass * velmag) / 10)); | 3080 | //ScriptSleep((int)((groupmass * velmag) / 10)); |
3081 | ScriptSleep(100); | 3081 | ScriptSleep(100); |
@@ -3270,7 +3270,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3270 | /// </remarks> | 3270 | /// </remarks> |
3271 | public void DetachFromAvatar() | 3271 | public void DetachFromAvatar() |
3272 | { | 3272 | { |
3273 | Util.FireAndForget(DetachWrapper, m_host); | 3273 | Util.FireAndForget(DetachWrapper, m_host, "LSL_Api.DetachFromAvatar"); |
3274 | } | 3274 | } |
3275 | 3275 | ||
3276 | private void DetachWrapper(object o) | 3276 | private void DetachWrapper(object o) |
@@ -12421,7 +12421,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
12421 | new LSL_String(replydata) }, | 12421 | new LSL_String(replydata) }, |
12422 | new DetectParams[0])); | 12422 | new DetectParams[0])); |
12423 | } | 12423 | } |
12424 | }); | 12424 | }, null, "LSL_Api.llTransferLindenDollars"); |
12425 | 12425 | ||
12426 | return txn.ToString(); | 12426 | return txn.ToString(); |
12427 | } | 12427 | } |
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 | ||