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/BSPhysObject.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/BSPhysObject.cs')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs index 991e5b1..e68b167 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |||
| @@ -94,9 +94,9 @@ public abstract class BSPhysObject : PhysicsActor | |||
| 94 | public PrimitiveBaseShape BaseShape { get; protected set; } | 94 | public PrimitiveBaseShape BaseShape { get; protected set; } |
| 95 | // Some types of objects have preferred physical representations. | 95 | // Some types of objects have preferred physical representations. |
| 96 | // Returns SHAPE_UNKNOWN if there is no preference. | 96 | // Returns SHAPE_UNKNOWN if there is no preference. |
| 97 | public virtual ShapeData.PhysicsShapeType PreferredPhysicalShape | 97 | public virtual PhysicsShapeType PreferredPhysicalShape |
| 98 | { | 98 | { |
| 99 | get { return ShapeData.PhysicsShapeType.SHAPE_UNKNOWN; } | 99 | get { return PhysicsShapeType.SHAPE_UNKNOWN; } |
| 100 | } | 100 | } |
| 101 | 101 | ||
| 102 | // When the physical properties are updated, an EntityProperty holds the update values. | 102 | // When the physical properties are updated, an EntityProperty holds the update values. |