From 43a6f286209e87ebaeabc9e1f966444fa2fac18e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 26 May 2012 01:55:35 +0100
Subject: If restating a region, clean up the physics scene after the main
 scene has been closed not before.

If this is done before then on ODE agent update calls still incoming can fail as they try to use a raycastmanager that has been disposed.
Bullet plugin does nothing on Dispose()
However, I wouldn't be at all surprised if individual region restarting was buggy in lots of other areas.
---
 OpenSim/Region/Framework/Scenes/Scene.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 98a75e4..ce386be 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1032,13 +1032,13 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
 
+            m_log.Error("[REGION]: Closing");
+            Close();
+
             if (PhysicsScene != null)
             {
                 PhysicsScene.Dispose();
-            }
-
-            m_log.Error("[REGION]: Closing");
-            Close();
+            }            
 
             m_log.Error("[REGION]: Firing Region Restart Message");
 
-- 
cgit v1.1