From 45b8e6c1a7282f6a7e32c0a51562927f9e9f04a4 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 14 Oct 2015 09:56:23 -0700
Subject: Fixed exception upon shutting down in plain ODE. 09:49:57 -
 [SHUTDOWN]: Ignoring failure during shutdown - System.NullReferenceException:
 Object reference not set to an instance of an object.    at
 OpenSim.Region.PhysicsModule.ODE.OdeScene.Dispose() in
 f:\dev\opensim-core\OpenSim\Region\PhysicsModules\Ode\OdeScene.cs:line 4062

---
 OpenSim/Region/PhysicsModules/Ode/OdeScene.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs b/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
index 144d762..adc8d98 100644
--- a/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
+++ b/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
@@ -4059,8 +4059,11 @@ namespace OpenSim.Region.PhysicsModule.ODE
         {
             _worldInitialized = false;
 
-            m_rayCastManager.Dispose();
-            m_rayCastManager = null;
+            if (m_rayCastManager != null)
+            {
+                m_rayCastManager.Dispose();
+                m_rayCastManager = null;
+            }
 
             lock (OdeLock)
             {
-- 
cgit v1.1