diff options
author | UbitUmarov | 2017-04-04 14:34:25 +0100 |
---|---|---|
committer | UbitUmarov | 2017-04-04 14:34:25 +0100 |
commit | ca250e0b0b564efaaeb5c0b80760126cfd710c5e (patch) | |
tree | 96f82f09fd71d63b380fe732e4e099f4bd4fd5de /OpenSim/Region/ScriptEngine/Shared/Api/Implementation | |
parent | mantis 8130: improve keyframes motion (diff) | |
download | opensim-SC_OLD-ca250e0b0b564efaaeb5c0b80760126cfd710c5e.zip opensim-SC_OLD-ca250e0b0b564efaaeb5c0b80760126cfd710c5e.tar.gz opensim-SC_OLD-ca250e0b0b564efaaeb5c0b80760126cfd710c5e.tar.bz2 opensim-SC_OLD-ca250e0b0b564efaaeb5c0b80760126cfd710c5e.tar.xz |
mantis 8740: rename osObjectTeleport as osTeleportObject, replaced the stop parameter by flags, add flags OSTPOBJ_STOPATTARRGET and OSTPOBJ_SETROT
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index ddf5078..b50ae28 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -4632,17 +4632,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4632 | /// <param name="objectUUID">the id of the linkset to teleport</param> | 4632 | /// <param name="objectUUID">the id of the linkset to teleport</param> |
4633 | /// <param name="targetPos">target position</param> | 4633 | /// <param name="targetPos">target position</param> |
4634 | /// <param name="rotation"> a rotation to apply</param> | 4634 | /// <param name="rotation"> a rotation to apply</param> |
4635 | /// <param name="stop">if TRUE (!=0) stop at destination</param> | 4635 | /// <param name="flags">several flags/param> |
4636 | /// <remarks> | 4636 | /// <remarks> |
4637 | /// only does teleport local to region | 4637 | /// only does teleport local to region |
4638 | /// object owner must have rights to run scripts on target location | 4638 | /// if object has scripts, owner must have rights to run scripts on target location |
4639 | /// object owner must have rights to enter ojects on target location | 4639 | /// object owner must have rights to enter ojects on target location |
4640 | /// target location parcel must have enought free prims capacity for the linkset prims | 4640 | /// target location parcel must have enought free prims capacity for the linkset prims |
4641 | /// all avatars siting on the object must have access to target location | 4641 | /// all avatars siting on the object must have access to target location |
4642 | /// has a cool down time. retries before expire reset it | 4642 | /// has a cool down time. retries before expire reset it |
4643 | /// fail conditions are silent ignored | 4643 | /// fail conditions are silent ignored |
4644 | /// </remarks> | 4644 | /// </remarks> |
4645 | public void osObjectTeleport(LSL_Key objectUUID, LSL_Vector targetPos, LSL_Rotation rotation, LSL_Integer stop) | 4645 | public void osTeleportObject(LSL_Key objectUUID, LSL_Vector targetPos, LSL_Rotation rotation, LSL_Integer flags) |
4646 | { | 4646 | { |
4647 | CheckThreatLevel(ThreatLevel.Severe, "osTeleportAgent"); | 4647 | CheckThreatLevel(ThreatLevel.Severe, "osTeleportAgent"); |
4648 | m_host.AddScriptLPS(1); | 4648 | m_host.AddScriptLPS(1); |
@@ -4660,7 +4660,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4660 | 4660 | ||
4661 | UUID myid = m_host.ParentGroup.UUID; | 4661 | UUID myid = m_host.ParentGroup.UUID; |
4662 | 4662 | ||
4663 | sog.ObjectTeleport(myid, targetPos, rotation, stop != 0); | 4663 | sog.TeleportObject(myid, targetPos, rotation, flags); |
4664 | // a delay here may break vehicles | 4664 | // a delay here may break vehicles |
4665 | } | 4665 | } |
4666 | } | 4666 | } |