From c1503205c028437507e2b8e4ab90e1258b1e9d60 Mon Sep 17 00:00:00 2001
From: Robert Adams <Robert.Adams@intel.com>
Date: Thu, 26 Jul 2012 15:27:18 -0700
Subject: [PATCH] Add a Dispose() of the physics engine when a scene is being
 shutdown.

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 24f62e3b86..1734704cf6 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1222,6 +1222,15 @@ namespace OpenSim.Region.Framework.Scenes
 
             m_sceneGraph.Close();
 
+            if (PhysicsScene != null)
+            {
+                PhysicsScene phys = PhysicsScene;
+                // remove the physics engine from both Scene and SceneGraph
+                PhysicsScene = null;
+                phys.Dispose();
+                phys = null;
+            }
+
             if (!GridService.DeregisterRegion(RegionInfo.RegionID))
                 m_log.WarnFormat("[SCENE]: Deregister from grid failed for region {0}", Name);