diff options
| author | BlueWall | 2013-01-15 10:08:27 -0500 |
|---|---|---|
| committer | BlueWall | 2013-01-15 10:08:27 -0500 |
| commit | f54b398540698e6e09022fe77b6405624b532f5c (patch) | |
| tree | 74581e7176d06dd8e2bff43720a3033ccfe6df0e /OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs | |
| parent | Add Json-Rpc 2.0 To Registered Handlers (diff) | |
| parent | BulletSim: tweeks to improve hover. (diff) | |
| download | opensim-SC-f54b398540698e6e09022fe77b6405624b532f5c.zip opensim-SC-f54b398540698e6e09022fe77b6405624b532f5c.tar.gz opensim-SC-f54b398540698e6e09022fe77b6405624b532f5c.tar.bz2 opensim-SC-f54b398540698e6e09022fe77b6405624b532f5c.tar.xz | |
Merge branch 'master' of /home/opensim/var/repo/opensim
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs b/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs index 0c7f315..b6ff52b 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs | |||
| @@ -1212,6 +1212,7 @@ private sealed class BulletConstraintXNA : BulletConstraint | |||
| 1212 | 1212 | ||
| 1213 | public override BulletShape GetChildShapeFromCompoundShapeIndex(BulletShape cShape, int indx) { /* TODO */ return null; } | 1213 | public override BulletShape GetChildShapeFromCompoundShapeIndex(BulletShape cShape, int indx) { /* TODO */ return null; } |
| 1214 | public override void RemoveChildShapeFromCompoundShape(BulletShape cShape, BulletShape removeShape) { /* TODO */ } | 1214 | public override void RemoveChildShapeFromCompoundShape(BulletShape cShape, BulletShape removeShape) { /* TODO */ } |
| 1215 | public override void UpdateChildTransform(BulletShape pShape, int childIndex, Vector3 pos, Quaternion rot, bool shouldRecalculateLocalAabb) { /* TODO */ } | ||
| 1215 | 1216 | ||
| 1216 | public override BulletShape CreateGroundPlaneShape(uint pLocalId, float pheight, float pcollisionMargin) | 1217 | public override BulletShape CreateGroundPlaneShape(uint pLocalId, float pheight, float pcollisionMargin) |
| 1217 | { | 1218 | { |