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/BSPrim.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Rename BulletSim's PhysicsShapeType to BSPhysicsShapeType because it (diff) | |
| download | opensim-SC-2bdd3eb918cede60290905974ea26d2bbd7d5187.zip opensim-SC-2bdd3eb918cede60290905974ea26d2bbd7d5187.tar.gz opensim-SC-2bdd3eb918cede60290905974ea26d2bbd7d5187.tar.bz2 opensim-SC-2bdd3eb918cede60290905974ea26d2bbd7d5187.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to '')
| -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) |