aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2018-11-15 22:17:44 +0000
committerUbitUmarov2018-11-15 22:17:44 +0000
commitd43eeb1d9d01b9ed9006b92d22cb0a77b712ef8d (patch)
treebe80ab716da0f521293077f7e7af730296954e53
parentupdate script syntax (diff)
downloadopensim-SC-d43eeb1d9d01b9ed9006b92d22cb0a77b712ef8d.zip
opensim-SC-d43eeb1d9d01b9ed9006b92d22cb0a77b712ef8d.tar.gz
opensim-SC-d43eeb1d9d01b9ed9006b92d22cb0a77b712ef8d.tar.bz2
opensim-SC-d43eeb1d9d01b9ed9006b92d22cb0a77b712ef8d.tar.xz
avoid a null ref on Bullet
-rwxr-xr-xOpenSim/Region/PhysicsModules/BulletS/BSPrimLinkable.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSPrimLinkable.cs b/OpenSim/Region/PhysicsModules/BulletS/BSPrimLinkable.cs
index 563dcfa..0d4be17 100755
--- a/OpenSim/Region/PhysicsModules/BulletS/BSPrimLinkable.cs
+++ b/OpenSim/Region/PhysicsModules/BulletS/BSPrimLinkable.cs
@@ -173,7 +173,8 @@ public class BSPrimLinkable : BSPrimDisplaced
173 // Body is being taken apart. Remove physical dependencies and schedule a rebuild. 173 // Body is being taken apart. Remove physical dependencies and schedule a rebuild.
174 protected override void RemoveDependencies() 174 protected override void RemoveDependencies()
175 { 175 {
176 Linkset.RemoveDependencies(this); 176 if (Linkset != null)
177 Linkset.RemoveDependencies(this);
177 base.RemoveDependencies(); 178 base.RemoveDependencies();
178 } 179 }
179 180