diff options
| author | Robert Adams | 2012-11-03 21:08:39 -0700 |
|---|---|---|
| committer | Robert Adams | 2012-11-03 21:16:02 -0700 |
| commit | 79f7c466a116bf368423d4e18163f34fd8d66ce1 (patch) | |
| tree | 8acd97fa89b1d900f785cec052fedfac7dde6027 /OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | |
| parent | BulletSim: search the mesh and hull lists to find shapes if type is not known... (diff) | |
| download | opensim-SC-79f7c466a116bf368423d4e18163f34fd8d66ce1.zip opensim-SC-79f7c466a116bf368423d4e18163f34fd8d66ce1.tar.gz opensim-SC-79f7c466a116bf368423d4e18163f34fd8d66ce1.tar.bz2 opensim-SC-79f7c466a116bf368423d4e18163f34fd8d66ce1.tar.xz | |
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.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | 2 |
1 files changed, 1 insertions, 1 deletions
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); | |||
| 614 | public static extern IntPtr BuildCapsuleShape2(IntPtr world, float radius, float height, Vector3 scale); | 614 | public static extern IntPtr BuildCapsuleShape2(IntPtr world, float radius, float height, Vector3 scale); |
| 615 | 615 | ||
| 616 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 616 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |
| 617 | public static extern IntPtr CreateCompoundShape2(IntPtr sim); | 617 | public static extern IntPtr CreateCompoundShape2(IntPtr sim, bool enableDynamicAabbTree); |
| 618 | 618 | ||
| 619 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 619 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |
| 620 | public static extern int GetNumberOfCompoundChildren2(IntPtr cShape); | 620 | public static extern int GetNumberOfCompoundChildren2(IntPtr cShape); |