aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorUbitUmarov2017-10-01 18:03:19 +0100
committerUbitUmarov2017-10-01 18:03:19 +0100
commitdb88c932439885693b91e9f0829e3eac74d25184 (patch)
tree212cadc7535f7b99a7365b9e450d1d86bedf7afe /OpenSim/Region/ScriptEngine
parentBulletSim: update MacOS version of libBulletSim to latest version. (diff)
downloadopensim-SC_OLD-db88c932439885693b91e9f0829e3eac74d25184.zip
opensim-SC_OLD-db88c932439885693b91e9f0829e3eac74d25184.tar.gz
opensim-SC_OLD-db88c932439885693b91e9f0829e3eac74d25184.tar.bz2
opensim-SC_OLD-db88c932439885693b91e9f0829e3eac74d25184.tar.xz
bug fix: add missing stub for osSetInertia
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs5
2 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 8f863af..429860b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -498,6 +498,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
498 498
499 LSL_List osGetInertiaData(); 499 LSL_List osGetInertiaData();
500 void osClearInertia(); 500 void osClearInertia();
501 void osSetInertia(LSL_Float mass, vector centerOfMass, vector principalInertiaScaled, rotation rot);
501 void osSetInertiaAsBox(LSL_Float mass, vector boxSize, vector centerOfMass, rotation rot); 502 void osSetInertiaAsBox(LSL_Float mass, vector boxSize, vector centerOfMass, rotation rot);
502 void osSetInertiaAsSphere(LSL_Float mass, LSL_Float radius, vector centerOfMass); 503 void osSetInertiaAsSphere(LSL_Float mass, LSL_Float radius, vector centerOfMass);
503 void osSetInertiaAsCylinder(LSL_Float mass, LSL_Float radius, LSL_Float lenght, vector centerOfMass,rotation lslrot); 504 void osSetInertiaAsCylinder(LSL_Float mass, LSL_Float radius, LSL_Float lenght, vector centerOfMass,rotation lslrot);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index 42e7bfb..23ea215 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -1156,6 +1156,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
1156 return m_OSSL_Functions.osGetInertiaData(); 1156 return m_OSSL_Functions.osGetInertiaData();
1157 } 1157 }
1158 1158
1159 public void osSetInertia(LSL_Float mass, vector centerOfMass, vector principalInertiaScaled, rotation rot)
1160 {
1161 m_OSSL_Functions.osSetInertia(mass, centerOfMass, principalInertiaScaled, rot);
1162 }
1163
1159 public void osSetInertiaAsBox(LSL_Float mass, vector boxSize, vector centerOfMass, rotation rot) 1164 public void osSetInertiaAsBox(LSL_Float mass, vector boxSize, vector centerOfMass, rotation rot)
1160 { 1165 {
1161 m_OSSL_Functions.osSetInertiaAsBox(mass, boxSize, centerOfMass, rot); 1166 m_OSSL_Functions.osSetInertiaAsBox(mass, boxSize, centerOfMass, rot);