From 0f7ffc56cee22aa95af58d19d3ea2193cea07340 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Sat, 15 Apr 2017 10:46:18 +0100
Subject: several changes for osTeleportObject

---
 OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')

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
         /// has a cool down time. retries before expire reset it
         /// fail conditions are silent ignored
         /// </remarks>
-        public void osTeleportObject(LSL_Key objectUUID, LSL_Vector targetPos, LSL_Rotation rotation, LSL_Integer flags)
+        public LSL_Integer osTeleportObject(LSL_Key objectUUID, LSL_Vector targetPos, LSL_Rotation rotation, LSL_Integer flags)
         {
             CheckThreatLevel(ThreatLevel.Severe, "osTeleportObject");
             m_host.AddScriptLPS(1);
@@ -4673,16 +4673,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (!UUID.TryParse(objectUUID, out objUUID))
             {
                 OSSLShoutError("osTeleportObject() invalid object Key");
-                return;
+                return -1;
             }
 
             SceneObjectGroup sog = World.GetSceneObjectGroup(objUUID);
             if(sog== null || sog.IsDeleted)
-                return;
+                return -1;
 
             UUID myid = m_host.ParentGroup.UUID;
 
-            sog.TeleportObject(myid, targetPos, rotation, flags);
+            return sog.TeleportObject(myid, targetPos, rotation, flags);
             // a delay here may break vehicles
         }
 
-- 
cgit v1.1