aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Runtime
diff options
context:
space:
mode:
authorUbitUmarov2019-09-04 23:27:48 +0100
committerUbitUmarov2019-09-04 23:27:48 +0100
commit93f13aa00d888753512b6e6488b34850a5fbed76 (patch)
treea72c5952f39946dc26c145993b89c1a5c8e81443 /OpenSim/Region/ScriptEngine/Shared/Api/Runtime
parentdon't wear vegetables (diff)
downloadopensim-SC-93f13aa00d888753512b6e6488b34850a5fbed76.zip
opensim-SC-93f13aa00d888753512b6e6488b34850a5fbed76.tar.gz
opensim-SC-93f13aa00d888753512b6e6488b34850a5fbed76.tar.bz2
opensim-SC-93f13aa00d888753512b6e6488b34850a5fbed76.tar.xz
add osSlerp()
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.cs5
2 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index 3f880e4..7edda58 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -35,7 +35,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
35 public partial class ScriptBaseClass 35 public partial class ScriptBaseClass
36 { 36 {
37 // SCRIPTS CONSTANTS 37 // SCRIPTS CONSTANTS
38 public static readonly LSLInteger OS_APIVERSION = 7; 38 public static readonly LSLInteger OS_APIVERSION = 8;
39 39
40 public static readonly LSLInteger TRUE = 1; 40 public static readonly LSLInteger TRUE = 1;
41 public static readonly LSLInteger FALSE = 0; 41 public static readonly LSLInteger FALSE = 0;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index 549047c..866a955 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -1407,5 +1407,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
1407 return m_OSSL_Functions.osGetPSTWallclock(); 1407 return m_OSSL_Functions.osGetPSTWallclock();
1408 } 1408 }
1409 1409
1410 public rotation osSlerp(rotation a, rotation b, LSL_Float amount)
1411 {
1412 return m_OSSL_Functions.osSlerp(a, b, amount);
1413 }
1414
1410 } 1415 }
1411} 1416}