diff options
| author | Melanie | 2012-11-22 14:45:41 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-22 14:45:41 +0000 |
| commit | 3b2caa63b0ba890555990a88821ee37daa2607b4 (patch) | |
| tree | a1f3c176b4b80330d34bbd6ac18811c5d7299081 /OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |
| parent | Factor out command script code. (diff) | |
| download | opensim-SC-3b2caa63b0ba890555990a88821ee37daa2607b4.zip opensim-SC-3b2caa63b0ba890555990a88821ee37daa2607b4.tar.gz opensim-SC-3b2caa63b0ba890555990a88821ee37daa2607b4.tar.bz2 opensim-SC-3b2caa63b0ba890555990a88821ee37daa2607b4.tar.xz | |
Rename BulletSim's PhysicsShapeType to BSPhysicsShapeType because it
conflicts with PhysicsShape type defined in later libOMV
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 { |