diff options
author | Justin Clarke Casey | 2008-09-29 15:40:16 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-09-29 15:40:16 +0000 |
commit | a888dbc60afa5b5e2510352c94fc4778b8a09102 (patch) | |
tree | fd1dd284a17c9b69b5987e0408df8856f4191186 /OpenSim/Region/Application/OpenSimBase.cs | |
parent | * minor: remove warnings (diff) | |
download | opensim-SC-a888dbc60afa5b5e2510352c94fc4778b8a09102.zip opensim-SC-a888dbc60afa5b5e2510352c94fc4778b8a09102.tar.gz opensim-SC-a888dbc60afa5b5e2510352c94fc4778b8a09102.tar.bz2 opensim-SC-a888dbc60afa5b5e2510352c94fc4778b8a09102.tar.xz |
* 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
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 9 |
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 | |||
747 | // TODO: implement this | 747 | // TODO: implement this |
748 | m_log.Info("[SHUTDOWN]: Closing console and terminating"); | 748 | m_log.Info("[SHUTDOWN]: Closing console and terminating"); |
749 | 749 | ||
750 | m_sceneManager.Close(); | 750 | try |
751 | { | ||
752 | m_sceneManager.Close(); | ||
753 | } | ||
754 | catch (Exception e) | ||
755 | { | ||
756 | m_log.ErrorFormat("[SHUTDOWN]: Ignoring failure during shutdown - {0}", e); | ||
757 | } | ||
751 | 758 | ||
752 | base.Shutdown(); | 759 | base.Shutdown(); |
753 | } | 760 | } |