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/BSPhysObject.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 '')
| -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 e68b167..f6a890e 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 PhysicsShapeType PreferredPhysicalShape | 97 | public virtual BSPhysicsShapeType PreferredPhysicalShape |
| 98 | { | 98 | { |
| 99 | get { return PhysicsShapeType.SHAPE_UNKNOWN; } | 99 | get { return BSPhysicsShapeType.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. |