diff options
| author | Robert Adams | 2012-11-20 11:24:25 -0800 |
|---|---|---|
| committer | Robert Adams | 2012-11-21 16:42:50 -0800 |
| commit | d6db0d5740dae03174f65846556f2f06d573b5c4 (patch) | |
| tree | 84d3377c6b9e9350ccb6edc64609cb61b9d86c97 /OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | |
| parent | BulletSim: change PositionSanityCheck to apply a force to correct position co... (diff) | |
| download | opensim-SC-d6db0d5740dae03174f65846556f2f06d573b5c4.zip opensim-SC-d6db0d5740dae03174f65846556f2f06d573b5c4.tar.gz opensim-SC-d6db0d5740dae03174f65846556f2f06d573b5c4.tar.bz2 opensim-SC-d6db0d5740dae03174f65846556f2f06d573b5c4.tar.xz | |
BulletSim: uplevel PhysicsShapeType out of ShapeData structure (since it is getting simplified out of existance someday) and update all the references to that enum.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs index b1b5846..2657e4b 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | |||
| @@ -169,7 +169,7 @@ public sealed class BSPrim : BSPhysObject | |||
| 169 | } | 169 | } |
| 170 | } | 170 | } |
| 171 | // Whatever the linkset wants is what I want. | 171 | // Whatever the linkset wants is what I want. |
| 172 | public override ShapeData.PhysicsShapeType PreferredPhysicalShape | 172 | public override PhysicsShapeType PreferredPhysicalShape |
| 173 | { get { return Linkset.PreferredPhysicalShape(this); } } | 173 | { get { return Linkset.PreferredPhysicalShape(this); } } |
| 174 | 174 | ||
| 175 | public override bool ForceBodyShapeRebuild(bool inTaintTime) | 175 | public override bool ForceBodyShapeRebuild(bool inTaintTime) |