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/BSLinkset.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 '')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs index 4ee047b..0df4310 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs | |||
| @@ -82,9 +82,9 @@ public abstract class BSLinkset | |||
| 82 | 82 | ||
| 83 | // Some linksets have a preferred physical shape. | 83 | // Some linksets have a preferred physical shape. |
| 84 | // Returns SHAPE_UNKNOWN if there is no preference. Causes the correct shape to be selected. | 84 | // Returns SHAPE_UNKNOWN if there is no preference. Causes the correct shape to be selected. |
| 85 | public virtual PhysicsShapeType PreferredPhysicalShape(BSPhysObject requestor) | 85 | public virtual BSPhysicsShapeType PreferredPhysicalShape(BSPhysObject requestor) |
| 86 | { | 86 | { |
| 87 | return PhysicsShapeType.SHAPE_UNKNOWN; | 87 | return BSPhysicsShapeType.SHAPE_UNKNOWN; |
| 88 | } | 88 | } |
| 89 | 89 | ||
| 90 | // Linksets move around the children so the linkset might need to compute the child position | 90 | // Linksets move around the children so the linkset might need to compute the child position |