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/BSApiTemplate.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-c846cefda97bd59b7707147d7ae1a520c9121127.zip opensim-SC-c846cefda97bd59b7707147d7ae1a520c9121127.tar.gz opensim-SC-c846cefda97bd59b7707147d7ae1a520c9121127.tar.bz2 opensim-SC-c846cefda97bd59b7707147d7ae1a520c9121127.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs index 794ee17..bc163eb 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs | |||
| @@ -342,6 +342,8 @@ public abstract BulletShape RemoveChildShapeFromCompoundShapeIndex(BulletShape c | |||
| 342 | 342 | ||
| 343 | public abstract void RemoveChildShapeFromCompoundShape(BulletShape cShape, BulletShape removeShape); | 343 | public abstract void RemoveChildShapeFromCompoundShape(BulletShape cShape, BulletShape removeShape); |
| 344 | 344 | ||
| 345 | public abstract void UpdateChildTransform(BulletShape pShape, int childIndex, Vector3 pos, Quaternion rot, bool shouldRecalculateLocalAabb); | ||
| 346 | |||
| 345 | public abstract void RecalculateCompoundShapeLocalAabb(BulletShape cShape); | 347 | public abstract void RecalculateCompoundShapeLocalAabb(BulletShape cShape); |
| 346 | 348 | ||
| 347 | public abstract BulletShape DuplicateCollisionShape(BulletWorld sim, BulletShape srcShape, uint id); | 349 | public abstract BulletShape DuplicateCollisionShape(BulletWorld sim, BulletShape srcShape, uint id); |