diff options
| author | Justin Clark-Casey (justincc) | 2013-01-15 00:24:51 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-01-15 00:24:51 +0000 |
| commit | c846cefda97bd59b7707147d7ae1a520c9121127 (patch) | |
| tree | ee23e4b451087874a8149348e010a905817121f7 /OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs | |
| parent | refactor: Simplify ScriptInstance by retaining reference to SceneObjectPart i... (diff) | |
| parent | BulletSim: fix not moving physical objects below terrain to over terrain. (diff) | |
| download | opensim-SC_OLD-c846cefda97bd59b7707147d7ae1a520c9121127.zip opensim-SC_OLD-c846cefda97bd59b7707147d7ae1a520c9121127.tar.gz opensim-SC_OLD-c846cefda97bd59b7707147d7ae1a520c9121127.tar.bz2 opensim-SC_OLD-c846cefda97bd59b7707147d7ae1a520c9121127.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/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 | { |