diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 1b275b0..104d22b 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -576,10 +576,15 @@ namespace OpenSim.Region.Framework.Scenes | |||
576 | 576 | ||
577 | StatsReporter.SetObjectCapacity(objectCapacity); | 577 | StatsReporter.SetObjectCapacity(objectCapacity); |
578 | 578 | ||
579 | // Old | ||
580 | /* | ||
579 | m_simulatorVersion = simulatorVersion | 581 | m_simulatorVersion = simulatorVersion |
580 | + " (OS " + Util.GetOperatingSystemInformation() + ")" | 582 | + " (OS " + Util.GetOperatingSystemInformation() + ")" |
581 | + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString() | 583 | + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString() |
582 | + " PhysPrim:" + m_physicalPrim.ToString(); | 584 | + " PhysPrim:" + m_physicalPrim.ToString(); |
585 | */ | ||
586 | |||
587 | m_simulatorVersion = simulatorVersion + " (" + Util.GetRuntimeInformation() + ")"; | ||
583 | 588 | ||
584 | try | 589 | try |
585 | { | 590 | { |
@@ -915,7 +920,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
915 | if (showDialog) | 920 | if (showDialog) |
916 | { | 921 | { |
917 | m_dialogModule.SendNotificationToUsersInRegion( | 922 | m_dialogModule.SendNotificationToUsersInRegion( |
918 | UUID.Random(), String.Empty, RegionInfo.RegionName + ": Restarting in " + (seconds / 60).ToString() + " Minutes"); | 923 | UUID.Random(), String.Empty, RegionInfo.RegionName + String.Format(": Restarting in {0} Minutes", (int)(seconds / 60.0))); |
919 | } | 924 | } |
920 | } | 925 | } |
921 | } | 926 | } |
@@ -946,6 +951,16 @@ namespace OpenSim.Region.Framework.Scenes | |||
946 | // This causes the region to restart immediatley. | 951 | // This causes the region to restart immediatley. |
947 | public void RestartNow() | 952 | public void RestartNow() |
948 | { | 953 | { |
954 | IConfig startupConfig = m_config.Configs["Startup"]; | ||
955 | if (startupConfig != null) | ||
956 | { | ||
957 | if (startupConfig.GetBoolean("InworldRestartShutsDown", false)) | ||
958 | { | ||
959 | MainConsole.Instance.RunCommand("shutdown"); | ||
960 | return; | ||
961 | } | ||
962 | } | ||
963 | |||
949 | if (PhysicsScene != null) | 964 | if (PhysicsScene != null) |
950 | { | 965 | { |
951 | PhysicsScene.Dispose(); | 966 | PhysicsScene.Dispose(); |
@@ -953,6 +968,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
953 | 968 | ||
954 | m_log.Error("[REGION]: Closing"); | 969 | m_log.Error("[REGION]: Closing"); |
955 | Close(); | 970 | Close(); |
971 | |||
956 | m_log.Error("[REGION]: Firing Region Restart Message"); | 972 | m_log.Error("[REGION]: Firing Region Restart Message"); |
957 | base.Restart(0); | 973 | base.Restart(0); |
958 | } | 974 | } |