diff options
| author | Robert Adams | 2013-02-26 11:32:01 -0800 |
|---|---|---|
| committer | Robert Adams | 2013-02-26 11:32:01 -0800 |
| commit | bf9132e1c7a1ddaf291101f60f43c0cbd0f53662 (patch) | |
| tree | cf9c78ff1ec7e6ead375f93c31d8ce7c5d262ebd /OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | |
| parent | BulletSim: tweeks to make avatar jump work better. (diff) | |
| download | opensim-SC_OLD-bf9132e1c7a1ddaf291101f60f43c0cbd0f53662.zip opensim-SC_OLD-bf9132e1c7a1ddaf291101f60f43c0cbd0f53662.tar.gz opensim-SC_OLD-bf9132e1c7a1ddaf291101f60f43c0cbd0f53662.tar.bz2 opensim-SC_OLD-bf9132e1c7a1ddaf291101f60f43c0cbd0f53662.tar.xz | |
BulletSim: fix crash around race condition when a mesh asset cannot
be fetched.
Update TODO list.
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 4dff927..8f660c4 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | |||
| @@ -470,7 +470,7 @@ public class BSPrim : BSPhysObject | |||
| 470 | // Note that this does not change _mass! | 470 | // Note that this does not change _mass! |
| 471 | public override void UpdatePhysicalMassProperties(float physMass, bool inWorld) | 471 | public override void UpdatePhysicalMassProperties(float physMass, bool inWorld) |
| 472 | { | 472 | { |
| 473 | if (PhysBody.HasPhysicalBody) | 473 | if (PhysBody.HasPhysicalBody && PhysShape.HasPhysicalShape) |
| 474 | { | 474 | { |
| 475 | if (IsStatic) | 475 | if (IsStatic) |
| 476 | { | 476 | { |