aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Runtime
diff options
context:
space:
mode:
authorUbitUmarov2017-04-15 10:46:18 +0100
committerUbitUmarov2017-04-15 10:46:18 +0100
commit0f7ffc56cee22aa95af58d19d3ea2193cea07340 (patch)
tree52ce76df16017d5adb3e1c8d1fa788ab90d26c65 /OpenSim/Region/ScriptEngine/Shared/Api/Runtime
parentstill issues with volume detectors and sleeping bodies (diff)
downloadopensim-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/Runtime')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs4
2 files changed, 3 insertions, 3 deletions
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
856 856
857 // for osTeleportObject 857 // for osTeleportObject
858 public const int OSTPOBJ_NONE = 0x0; 858 public const int OSTPOBJ_NONE = 0x0;
859 public const int OSTPOBJ_STOPATTARRGET = 0x1; // stops at destination 859 public const int OSTPOBJ_STOPATTARGET = 0x1; // stops at destination
860 public const int OSTPOBJ_STOPONFAIL = 0x2; // stops at jump point if tp fails 860 public const int OSTPOBJ_STOPONFAIL = 0x2; // stops at jump point if tp fails
861 public const int OSTPOBJ_SETROT = 0x4; // the rotation is the final rotation, otherwise is a added rotation 861 public const int OSTPOBJ_SETROT = 0x4; // the rotation is the final rotation, otherwise is a added rotation
862 862
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
1140 m_OSSL_Functions.osClearInertia(); 1140 m_OSSL_Functions.osClearInertia();
1141 } 1141 }
1142 1142
1143 public void osTeleportObject(LSL_Key objectUUID, vector targetPos, rotation targetrotation, LSL_Integer flags) 1143 public LSL_Integer osTeleportObject(LSL_Key objectUUID, vector targetPos, rotation targetrotation, LSL_Integer flags)
1144 { 1144 {
1145 m_OSSL_Functions.osTeleportObject(objectUUID, targetPos, targetrotation, flags); 1145 return m_OSSL_Functions.osTeleportObject(objectUUID, targetPos, targetrotation, flags);
1146 } 1146 }
1147 1147
1148 public LSL_Integer osGetLinkNumber(LSL_String name) 1148 public LSL_Integer osGetLinkNumber(LSL_String name)