diff options
| author | Melanie | 2013-03-26 03:26:02 +0000 |
|---|---|---|
| committer | Melanie | 2013-03-26 03:26:02 +0000 |
| commit | 95d0a7d4faffd94199f49e2bd0d658d2d8333189 (patch) | |
| tree | 639471bf99034d3209ca6b8496668d9e0fbdbe84 /OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | BulletSim: new algorithm for vertical attraction which uses quaternion (diff) | |
| download | opensim-SC-95d0a7d4faffd94199f49e2bd0d658d2d8333189.zip opensim-SC-95d0a7d4faffd94199f49e2bd0d658d2d8333189.tar.gz opensim-SC-95d0a7d4faffd94199f49e2bd0d658d2d8333189.tar.bz2 opensim-SC-95d0a7d4faffd94199f49e2bd0d658d2d8333189.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
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 2cbbe9a..6a5461a 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | |||
| @@ -155,7 +155,7 @@ public class BSPrim : BSPhysObject | |||
| 155 | public override PrimitiveBaseShape Shape { | 155 | public override PrimitiveBaseShape Shape { |
| 156 | set { | 156 | set { |
| 157 | BaseShape = value; | 157 | BaseShape = value; |
| 158 | LastAssetBuildFailed = false; | 158 | PrimAssetState = PrimAssetCondition.Unknown; |
| 159 | ForceBodyShapeRebuild(false); | 159 | ForceBodyShapeRebuild(false); |
| 160 | } | 160 | } |
| 161 | } | 161 | } |