From 27206eccef36546753d2e532917ccd3e56877f63 Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Thu, 25 Oct 2012 23:47:13 +0100
Subject: [PATCH] minor: if a scene is already shutting down on Scene.Close(),
 warn and exit instead of attempting to run another shutdown concurrently.

Thanks to Oren Hurvitz for this change.
---
 OpenSim/Region/Framework/Scenes/Scene.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 6b81c973e3..b1e5ea948e 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1223,6 +1223,12 @@ namespace OpenSim.Region.Framework.Scenes
         // This is the method that shuts down the scene.
         public override void Close()
         {
+            if (m_shuttingDown)
+            {
+                m_log.WarnFormat("[SCENE]: Ignoring close request because already closing {0}", Name);
+                return;
+            }
+
             m_log.InfoFormat("[SCENE]: Closing down the single simulator: {0}", RegionInfo.RegionName);
 
             StatsReporter.Close();