diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index db45d6b..1ad5edd 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -740,7 +740,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
740 | // | 740 | // |
741 | // Out of memory | 741 | // Out of memory |
742 | // Operating system has killed the plugin | 742 | // Operating system has killed the plugin |
743 | m_sceneGraph.UnRecoverableError += RestartNow; | 743 | m_sceneGraph.UnRecoverableError |
744 | += () => | ||
745 | { | ||
746 | m_log.ErrorFormat("[SCENE]: Restarting region {0} due to unrecoverable physics crash", Name); | ||
747 | RestartNow(); | ||
748 | }; | ||
744 | 749 | ||
745 | RegisterDefaultSceneEvents(); | 750 | RegisterDefaultSceneEvents(); |
746 | 751 | ||
@@ -1134,15 +1139,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
1134 | } | 1139 | } |
1135 | } | 1140 | } |
1136 | 1141 | ||
1137 | m_log.Error("[REGION]: Closing"); | 1142 | m_log.InfoFormat("[REGION]: Restarting region {0}", Name); |
1138 | Close(); | ||
1139 | 1143 | ||
1140 | if (PhysicsScene != null) | 1144 | Close(); |
1141 | { | ||
1142 | PhysicsScene.Dispose(); | ||
1143 | } | ||
1144 | |||
1145 | m_log.Error("[REGION]: Firing Region Restart Message"); | ||
1146 | 1145 | ||
1147 | base.Restart(); | 1146 | base.Restart(); |
1148 | } | 1147 | } |