diff options
| author | Melanie | 2012-11-22 14:47:57 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-22 14:47:57 +0000 |
| commit | 2bdd3eb918cede60290905974ea26d2bbd7d5187 (patch) | |
| tree | f492abae6df9a63505ecf7703932562bd1c0f457 /OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Rename BulletSim's PhysicsShapeType to BSPhysicsShapeType because it (diff) | |
| download | opensim-SC_OLD-2bdd3eb918cede60290905974ea26d2bbd7d5187.zip opensim-SC_OLD-2bdd3eb918cede60290905974ea26d2bbd7d5187.tar.gz opensim-SC_OLD-2bdd3eb918cede60290905974ea26d2bbd7d5187.tar.bz2 opensim-SC_OLD-2bdd3eb918cede60290905974ea26d2bbd7d5187.tar.xz | |
Merge branch 'master' into careminster
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 e2aa41e..4c195e1 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |||
| @@ -208,9 +208,9 @@ public sealed class BSCharacter : BSPhysObject | |||
| 208 | set { BaseShape = value; } | 208 | set { BaseShape = value; } |
| 209 | } | 209 | } |
| 210 | // I want the physics engine to make an avatar capsule | 210 | // I want the physics engine to make an avatar capsule |
| 211 | public override PhysicsShapeType PreferredPhysicalShape | 211 | public override BSPhysicsShapeType PreferredPhysicalShape |
| 212 | { | 212 | { |
| 213 | get {return PhysicsShapeType.SHAPE_CAPSULE; } | 213 | get {return BSPhysicsShapeType.SHAPE_CAPSULE; } |
| 214 | } | 214 | } |
| 215 | 215 | ||
| 216 | public override bool Grabbed { | 216 | public override bool Grabbed { |