diff options
| author | Justin Clark-Casey (justincc) | 2012-07-27 00:30:04 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-07-27 00:30:04 +0100 |
| commit | 5f741143fd328e8b13b512d9cc611178433eaef7 (patch) | |
| tree | 06f919ea81fdd26918f64fc50521b0dc0ffedd40 /OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | |
| parent | Fix issue where RegionCombinerModule was not removing regions from its dictio... (diff) | |
| parent | BulletSim: fix a recursive loop when fetching the mass of the root of a linkset. (diff) | |
| download | opensim-SC_OLD-5f741143fd328e8b13b512d9cc611178433eaef7.zip opensim-SC_OLD-5f741143fd328e8b13b512d9cc611178433eaef7.tar.gz opensim-SC_OLD-5f741143fd328e8b13b512d9cc611178433eaef7.tar.bz2 opensim-SC_OLD-5f741143fd328e8b13b512d9cc611178433eaef7.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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 89fd9b7..65e3145 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | |||
| @@ -239,10 +239,10 @@ public static extern bool DestroyMesh(uint worldID, System.UInt64 meshKey); | |||
| 239 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 239 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |
| 240 | public static extern bool CreateObject(uint worldID, ShapeData shapeData); | 240 | public static extern bool CreateObject(uint worldID, ShapeData shapeData); |
| 241 | 241 | ||
| 242 | /* Remove old functionality | ||
| 242 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 243 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |
| 243 | public static extern void CreateLinkset(uint worldID, int objectCount, ShapeData[] shapeDatas); | 244 | public static extern void CreateLinkset(uint worldID, int objectCount, ShapeData[] shapeDatas); |
| 244 | 245 | ||
| 245 | /* Remove old functionality | ||
| 246 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 246 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |
| 247 | public static extern void AddConstraint(uint worldID, uint id1, uint id2, | 247 | public static extern void AddConstraint(uint worldID, uint id1, uint id2, |
| 248 | Vector3 frame1, Quaternion frame1rot, | 248 | Vector3 frame1, Quaternion frame1rot, |