From 79f7c466a116bf368423d4e18163f34fd8d66ce1 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sat, 3 Nov 2012 21:08:39 -0700
Subject: BulletSim: fix compound linkset crash by not freeing shape of child
 prims. Remove all compilation warnings (mostly 'protected' in sealed
 classes.) Add the dynamicAabbEnable parameter to creation of compound shapes.

---
 OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs')

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
index ac6d2b2..702bd77 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
@@ -614,7 +614,7 @@ public static extern bool IsNativeShape2(IntPtr shape);
 public static extern IntPtr BuildCapsuleShape2(IntPtr world, float radius, float height, Vector3 scale);
 
 [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
-public static extern IntPtr CreateCompoundShape2(IntPtr sim);
+public static extern IntPtr CreateCompoundShape2(IntPtr sim, bool enableDynamicAabbTree);
 
 [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
 public static extern int GetNumberOfCompoundChildren2(IntPtr cShape);
-- 
cgit v1.1