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/Runtime/LSL_Constants.cs | 2 +-
 OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index 59493a3..ce0fa48 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -856,7 +856,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
 
         // for osTeleportObject
         public const int OSTPOBJ_NONE           = 0x0;
-        public const int OSTPOBJ_STOPATTARRGET  = 0x1; // stops at destination
+        public const int OSTPOBJ_STOPATTARGET   = 0x1; // stops at destination
         public const int OSTPOBJ_STOPONFAIL     = 0x2; // stops at jump point if tp fails
         public const int OSTPOBJ_SETROT         = 0x4; // the rotation is the final rotation, otherwise is a added rotation
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index 7c08628..9eac114 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -1140,9 +1140,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             m_OSSL_Functions.osClearInertia();
         }
 
-        public void osTeleportObject(LSL_Key objectUUID, vector targetPos, rotation targetrotation, LSL_Integer flags)
+        public LSL_Integer osTeleportObject(LSL_Key objectUUID, vector targetPos, rotation targetrotation, LSL_Integer flags)
         {
-            m_OSSL_Functions.osTeleportObject(objectUUID, targetPos, targetrotation, flags);
+            return m_OSSL_Functions.osTeleportObject(objectUUID, targetPos, targetrotation, flags);
         }
 
         public LSL_Integer osGetLinkNumber(LSL_String name)
-- 
cgit v1.1