From d43eeb1d9d01b9ed9006b92d22cb0a77b712ef8d Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Thu, 15 Nov 2018 22:17:44 +0000
Subject: avoid a null ref on Bullet

---
 OpenSim/Region/PhysicsModules/BulletS/BSPrimLinkable.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/PhysicsModules/BulletS')

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
     // Body is being taken apart. Remove physical dependencies and schedule a rebuild.
     protected override void RemoveDependencies()
     {
-        Linkset.RemoveDependencies(this);
+        if (Linkset != null)
+            Linkset.RemoveDependencies(this);
         base.RemoveDependencies();
     }
 
-- 
cgit v1.1