From 963cf25813ad2bd6dceaa39757391fbf94d6f09e Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Sun, 13 Dec 2009 03:04:16 +1100
Subject: * Implements OSSL function: osGetSimulatorMemory - returns the
 current amount of memory allocated to the simulator process (Moderate Threat
 Level). * Cleans redundant information out of the Simulator Version. Versions
 now look like: "OpenSimulator 0.6.9(dev) Unix/Mono" * [Minor] additional log
 info for MySQLInventoryData

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index a22fb5f..cc13972 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -574,10 +574,15 @@ namespace OpenSim.Region.Framework.Scenes
 
             StatsReporter.SetObjectCapacity(objectCapacity);
 
+            // Old
+            /*
             m_simulatorVersion = simulatorVersion
                 + " (OS " + Util.GetOperatingSystemInformation() + ")"
                 + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString()
                 + " PhysPrim:" + m_physicalPrim.ToString();
+            */
+
+            m_simulatorVersion = simulatorVersion + " (" + Util.GetRuntimeInformation() + ")";
 
             try
             {
-- 
cgit v1.1


From c426549f53cb08ab2d55770cc498faa6f94bf66e Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 14 Dec 2009 00:31:15 +0000
Subject: Add an option to exit an instance rather than restarting a region
 within it

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')

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
                 m_log.Info("[REGION]: Restarting Region in " + (seconds / 60) + " minutes");
                 m_restartTimer.Start();
                 m_dialogModule.SendNotificationToUsersInRegion(
-                    UUID.Random(), String.Empty, RegionInfo.RegionName + ": Restarting in 2 Minutes");
+                    UUID.Random(), String.Empty, RegionInfo.RegionName + String.Format(": Restarting in {0} Minutes", (int)(seconds / 60.0)));
             }
         }
 
@@ -932,6 +932,16 @@ namespace OpenSim.Region.Framework.Scenes
         // This causes the region to restart immediatley.
         public void RestartNow()
         {
+            IConfig startupConfig = m_config.Configs["Startup"];
+            if (startupConfig != null)
+            {
+                if (startupConfig.GetBoolean("InworldRestartShutsDown", false))
+                {
+                    MainConsole.Instance.RunCommand("shutdown");
+                    return;
+                }
+            }
+
             if (PhysicsScene != null)
             {
                 PhysicsScene.Dispose();
@@ -939,6 +949,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             m_log.Error("[REGION]: Closing");
             Close();
+
             m_log.Error("[REGION]: Firing Region Restart Message");
             base.Restart(0);
         }
-- 
cgit v1.1