From 61808d148e963ae59e4a3b5a99cdafff7bcb29c0 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 23 Nov 2012 01:01:39 +0000
Subject: Fix regression where we stopped closing scenes on simulator exit.

If we don't do this, then these scenes don't get deregistered from the grid, amongst other things.
Regression was introduced in commit 8c130bc (Mon Nov 12 22:50:28 2012 +0000)
---
 OpenSim/Region/Framework/Scenes/SceneManager.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs
index 9bd27d3..1c236db 100644
--- a/OpenSim/Region/Framework/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs
@@ -141,6 +141,13 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void Close()
         {
+            lock (m_localScenes)
+            {
+                for (int i = 0; i < m_localScenes.Count; i++)
+                {
+                    m_localScenes[i].Close();
+                }
+            }
         }
 
         public void Close(Scene cscene)
-- 
cgit v1.1


From 7133b6bb4f78fb303425215031a0bb7cb531270b Mon Sep 17 00:00:00 2001
From: justincc
Date: Fri, 23 Nov 2012 01:43:11 +0000
Subject: Fix recent windows build break.

Add missing OpenSim.Framework.Servers reference
---
 prebuild.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/prebuild.xml b/prebuild.xml
index 5be86e2..101d48f 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1367,6 +1367,7 @@
       <Reference name="OpenMetaverse.StructuredData" path="../../bin/"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="OpenSim.Framework.Servers"/>
       <Reference name="OpenSim.Framework.Servers.HttpServer"/>
       <Reference name="OpenSim.Server.Base"/>
       <Reference name="Nini" path="../../bin/"/>
-- 
cgit v1.1