* Fix http://opensimulator.org/mantis/view.php?id=2189 for real this time

* Ignore any exception encountered during shutdown rather than aborting the quit command

1 files changed, 8 insertions, 1 deletions

diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 63c9a63..445fba0 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -747,7 +747,14 @@ namespace OpenSim
             // TODO: implement this
             m_log.Info("[SHUTDOWN]: Closing console and terminating");
 
-            m_sceneManager.Close();
+            try
+            {   
+                m_sceneManager.Close();
+            }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat("[SHUTDOWN]: Ignoring failure during shutdown - {0}", e);
+            }
 
             base.Shutdown();
         }