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/BSPrim.cs | |
| parent | Factor out command script code. (diff) | |
| download | opensim-SC_OLD-3b2caa63b0ba890555990a88821ee37daa2607b4.zip opensim-SC_OLD-3b2caa63b0ba890555990a88821ee37daa2607b4.tar.gz opensim-SC_OLD-3b2caa63b0ba890555990a88821ee37daa2607b4.tar.bz2 opensim-SC_OLD-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/BSPrim.cs')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs index 5d16bbf..2b3fa25 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | |||
| @@ -171,7 +171,7 @@ public sealed class BSPrim : BSPhysObject | |||
| 171 | } | 171 | } |
| 172 | } | 172 | } |
| 173 | // Whatever the linkset wants is what I want. | 173 | // Whatever the linkset wants is what I want. |
| 174 | public override PhysicsShapeType PreferredPhysicalShape | 174 | public override BSPhysicsShapeType PreferredPhysicalShape |
| 175 | { get { return Linkset.PreferredPhysicalShape(this); } } | 175 | { get { return Linkset.PreferredPhysicalShape(this); } } |
| 176 | 176 | ||
| 177 | public override bool ForceBodyShapeRebuild(bool inTaintTime) | 177 | public override bool ForceBodyShapeRebuild(bool inTaintTime) |