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/BSLinkset.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 'OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs index 436e043..4ee047b 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs | |||
| @@ -82,9 +82,9 @@ public abstract class BSLinkset | |||
| 82 | 82 | ||
| 83 | // Some linksets have a preferred physical shape. | 83 | // Some linksets have a preferred physical shape. |
| 84 | // Returns SHAPE_UNKNOWN if there is no preference. Causes the correct shape to be selected. | 84 | // Returns SHAPE_UNKNOWN if there is no preference. Causes the correct shape to be selected. |
| 85 | public virtual ShapeData.PhysicsShapeType PreferredPhysicalShape(BSPhysObject requestor) | 85 | public virtual PhysicsShapeType PreferredPhysicalShape(BSPhysObject requestor) |
| 86 | { | 86 | { |
| 87 | return ShapeData.PhysicsShapeType.SHAPE_UNKNOWN; | 87 | return PhysicsShapeType.SHAPE_UNKNOWN; |
| 88 | } | 88 | } |
| 89 | 89 | ||
| 90 | // Linksets move around the children so the linkset might need to compute the child position | 90 | // Linksets move around the children so the linkset might need to compute the child position |