diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index cc13972..eb284c1 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -907,7 +907,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
907 | m_log.Info("[REGION]: Restarting Region in " + (seconds / 60) + " minutes"); | 907 | m_log.Info("[REGION]: Restarting Region in " + (seconds / 60) + " minutes"); |
908 | m_restartTimer.Start(); | 908 | m_restartTimer.Start(); |
909 | m_dialogModule.SendNotificationToUsersInRegion( | 909 | m_dialogModule.SendNotificationToUsersInRegion( |
910 | UUID.Random(), String.Empty, RegionInfo.RegionName + ": Restarting in 2 Minutes"); | 910 | UUID.Random(), String.Empty, RegionInfo.RegionName + String.Format(": Restarting in {0} Minutes", (int)(seconds / 60.0))); |
911 | } | 911 | } |
912 | } | 912 | } |
913 | 913 | ||
@@ -937,6 +937,16 @@ namespace OpenSim.Region.Framework.Scenes | |||
937 | // This causes the region to restart immediatley. | 937 | // This causes the region to restart immediatley. |
938 | public void RestartNow() | 938 | public void RestartNow() |
939 | { | 939 | { |
940 | IConfig startupConfig = m_config.Configs["Startup"]; | ||
941 | if (startupConfig != null) | ||
942 | { | ||
943 | if (startupConfig.GetBoolean("InworldRestartShutsDown", false)) | ||
944 | { | ||
945 | MainConsole.Instance.RunCommand("shutdown"); | ||
946 | return; | ||
947 | } | ||
948 | } | ||
949 | |||
940 | if (PhysicsScene != null) | 950 | if (PhysicsScene != null) |
941 | { | 951 | { |
942 | PhysicsScene.Dispose(); | 952 | PhysicsScene.Dispose(); |
@@ -944,6 +954,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
944 | 954 | ||
945 | m_log.Error("[REGION]: Closing"); | 955 | m_log.Error("[REGION]: Closing"); |
946 | Close(); | 956 | Close(); |
957 | |||
947 | m_log.Error("[REGION]: Firing Region Restart Message"); | 958 | m_log.Error("[REGION]: Firing Region Restart Message"); |
948 | base.Restart(0); | 959 | base.Restart(0); |
949 | } | 960 | } |