diff options
author | UbitUmarov | 2017-04-15 10:46:18 +0100 |
---|---|---|
committer | UbitUmarov | 2017-04-15 10:46:18 +0100 |
commit | 0f7ffc56cee22aa95af58d19d3ea2193cea07340 (patch) | |
tree | 52ce76df16017d5adb3e1c8d1fa788ab90d26c65 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation | |
parent | still issues with volume detectors and sleeping bodies (diff) | |
download | opensim-SC_OLD-0f7ffc56cee22aa95af58d19d3ea2193cea07340.zip opensim-SC_OLD-0f7ffc56cee22aa95af58d19d3ea2193cea07340.tar.gz opensim-SC_OLD-0f7ffc56cee22aa95af58d19d3ea2193cea07340.tar.bz2 opensim-SC_OLD-0f7ffc56cee22aa95af58d19d3ea2193cea07340.tar.xz |
several changes for osTeleportObject
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 b3bd8c4..e12cedf 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -4664,7 +4664,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4664 | /// has a cool down time. retries before expire reset it | 4664 | /// has a cool down time. retries before expire reset it |
4665 | /// fail conditions are silent ignored | 4665 | /// fail conditions are silent ignored |
4666 | /// </remarks> | 4666 | /// </remarks> |
4667 | public void osTeleportObject(LSL_Key objectUUID, LSL_Vector targetPos, LSL_Rotation rotation, LSL_Integer flags) | 4667 | public LSL_Integer osTeleportObject(LSL_Key objectUUID, LSL_Vector targetPos, LSL_Rotation rotation, LSL_Integer flags) |
4668 | { | 4668 | { |
4669 | CheckThreatLevel(ThreatLevel.Severe, "osTeleportObject"); | 4669 | CheckThreatLevel(ThreatLevel.Severe, "osTeleportObject"); |
4670 | m_host.AddScriptLPS(1); | 4670 | m_host.AddScriptLPS(1); |
@@ -4673,16 +4673,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4673 | if (!UUID.TryParse(objectUUID, out objUUID)) | 4673 | if (!UUID.TryParse(objectUUID, out objUUID)) |
4674 | { | 4674 | { |
4675 | OSSLShoutError("osTeleportObject() invalid object Key"); | 4675 | OSSLShoutError("osTeleportObject() invalid object Key"); |
4676 | return; | 4676 | return -1; |
4677 | } | 4677 | } |
4678 | 4678 | ||
4679 | SceneObjectGroup sog = World.GetSceneObjectGroup(objUUID); | 4679 | SceneObjectGroup sog = World.GetSceneObjectGroup(objUUID); |
4680 | if(sog== null || sog.IsDeleted) | 4680 | if(sog== null || sog.IsDeleted) |
4681 | return; | 4681 | return -1; |
4682 | 4682 | ||
4683 | UUID myid = m_host.ParentGroup.UUID; | 4683 | UUID myid = m_host.ParentGroup.UUID; |
4684 | 4684 | ||
4685 | sog.TeleportObject(myid, targetPos, rotation, flags); | 4685 | return sog.TeleportObject(myid, targetPos, rotation, flags); |
4686 | // a delay here may break vehicles | 4686 | // a delay here may break vehicles |
4687 | } | 4687 | } |
4688 | 4688 | ||