diff options
author | Melanie | 2009-12-14 00:31:15 +0000 |
---|---|---|
committer | Melanie | 2009-12-14 00:31:15 +0000 |
commit | c426549f53cb08ab2d55770cc498faa6f94bf66e (patch) | |
tree | e4f2fc2a7a7682d6c988fce79ead86654fd82d00 /OpenSim/Region | |
parent | * Bugfix mantis 4441, "Use of Autopilot isn't playing any animations." (diff) | |
download | opensim-SC-c426549f53cb08ab2d55770cc498faa6f94bf66e.zip opensim-SC-c426549f53cb08ab2d55770cc498faa6f94bf66e.tar.gz opensim-SC-c426549f53cb08ab2d55770cc498faa6f94bf66e.tar.bz2 opensim-SC-c426549f53cb08ab2d55770cc498faa6f94bf66e.tar.xz |
Add an option to exit an instance rather than restarting a region within it
Diffstat (limited to 'OpenSim/Region')
-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 a22fb5f..4241b20 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -902,7 +902,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
902 | m_log.Info("[REGION]: Restarting Region in " + (seconds / 60) + " minutes"); | 902 | m_log.Info("[REGION]: Restarting Region in " + (seconds / 60) + " minutes"); |
903 | m_restartTimer.Start(); | 903 | m_restartTimer.Start(); |
904 | m_dialogModule.SendNotificationToUsersInRegion( | 904 | m_dialogModule.SendNotificationToUsersInRegion( |
905 | UUID.Random(), String.Empty, RegionInfo.RegionName + ": Restarting in 2 Minutes"); | 905 | UUID.Random(), String.Empty, RegionInfo.RegionName + String.Format(": Restarting in {0} Minutes", (int)(seconds / 60.0))); |
906 | } | 906 | } |
907 | } | 907 | } |
908 | 908 | ||
@@ -932,6 +932,16 @@ namespace OpenSim.Region.Framework.Scenes | |||
932 | // This causes the region to restart immediatley. | 932 | // This causes the region to restart immediatley. |
933 | public void RestartNow() | 933 | public void RestartNow() |
934 | { | 934 | { |
935 | IConfig startupConfig = m_config.Configs["Startup"]; | ||
936 | if (startupConfig != null) | ||
937 | { | ||
938 | if (startupConfig.GetBoolean("InworldRestartShutsDown", false)) | ||
939 | { | ||
940 | MainConsole.Instance.RunCommand("shutdown"); | ||
941 | return; | ||
942 | } | ||
943 | } | ||
944 | |||
935 | if (PhysicsScene != null) | 945 | if (PhysicsScene != null) |
936 | { | 946 | { |
937 | PhysicsScene.Dispose(); | 947 | PhysicsScene.Dispose(); |
@@ -939,6 +949,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
939 | 949 | ||
940 | m_log.Error("[REGION]: Closing"); | 950 | m_log.Error("[REGION]: Closing"); |
941 | Close(); | 951 | Close(); |
952 | |||
942 | m_log.Error("[REGION]: Firing Region Restart Message"); | 953 | m_log.Error("[REGION]: Firing Region Restart Message"); |
943 | base.Restart(0); | 954 | base.Restart(0); |
944 | } | 955 | } |