From cc915b4d05124281bc71fb6b5d05416dce6bbfcb Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 20 Sep 2017 21:02:00 -0700
Subject: BulletSim: update MacOS version of libBulletSim to latest version.   
 See Mantis 8232.    Thanks Gavin Hird.

---
 bin/lib32/libBulletSim.dylib | Bin 2234160 -> 2243876 bytes
 bin/lib64/libBulletSim.dylib | Bin 2234160 -> 2243876 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/bin/lib32/libBulletSim.dylib b/bin/lib32/libBulletSim.dylib
index f8eeedc..e4508e6 100755
Binary files a/bin/lib32/libBulletSim.dylib and b/bin/lib32/libBulletSim.dylib differ
diff --git a/bin/lib64/libBulletSim.dylib b/bin/lib64/libBulletSim.dylib
index f8eeedc..e4508e6 100755
Binary files a/bin/lib64/libBulletSim.dylib and b/bin/lib64/libBulletSim.dylib differ
-- 
cgit v1.1


From db88c932439885693b91e9f0829e3eac74d25184 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Sun, 1 Oct 2017 18:03:19 +0100
Subject: bug fix: add missing stub for osSetInertia

---
 OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 1 +
 OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs   | 5 +++++
 2 files changed, 6 insertions(+)

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
 
         LSL_List osGetInertiaData();
         void osClearInertia();
+        void osSetInertia(LSL_Float mass, vector centerOfMass, vector principalInertiaScaled,  rotation rot);
         void osSetInertiaAsBox(LSL_Float mass, vector boxSize, vector centerOfMass, rotation rot);
         void osSetInertiaAsSphere(LSL_Float mass,  LSL_Float radius, vector centerOfMass);
         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
             return m_OSSL_Functions.osGetInertiaData();
         }
 
+        public void osSetInertia(LSL_Float mass, vector centerOfMass, vector principalInertiaScaled,  rotation rot)
+        {
+            m_OSSL_Functions.osSetInertia(mass, centerOfMass, principalInertiaScaled, rot);
+        }
+
         public void osSetInertiaAsBox(LSL_Float mass, vector boxSize, vector centerOfMass, rotation rot)
         {
             m_OSSL_Functions.osSetInertiaAsBox(mass, boxSize, centerOfMass, rot);
-- 
cgit v1.1