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/BSCharacter.cs | |
| parent | BulletSim: change PositionSanityCheck to apply a force to correct position co... (diff) | |
| download | opensim-SC_OLD-d6db0d5740dae03174f65846556f2f06d573b5c4.zip opensim-SC_OLD-d6db0d5740dae03174f65846556f2f06d573b5c4.tar.gz opensim-SC_OLD-d6db0d5740dae03174f65846556f2f06d573b5c4.tar.bz2 opensim-SC_OLD-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/BSCharacter.cs')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs index fa1a23f..92ff804 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |||
| @@ -203,9 +203,9 @@ public sealed class BSCharacter : BSPhysObject | |||
| 203 | set { BaseShape = value; } | 203 | set { BaseShape = value; } |
| 204 | } | 204 | } |
| 205 | // I want the physics engine to make an avatar capsule | 205 | // I want the physics engine to make an avatar capsule |
| 206 | public override ShapeData.PhysicsShapeType PreferredPhysicalShape | 206 | public override PhysicsShapeType PreferredPhysicalShape |
| 207 | { | 207 | { |
| 208 | get {return ShapeData.PhysicsShapeType.SHAPE_AVATAR; } | 208 | get {return PhysicsShapeType.SHAPE_AVATAR; } |
| 209 | } | 209 | } |
| 210 | 210 | ||
| 211 | public override bool Grabbed { | 211 | public override bool Grabbed { |