Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

2026-08-07 09:45:47 +08:00 · 2009-12-14 00:32:00 +00:00
parent c426549f53 f046457249
commit 0813dc8c1d
9 changed files with 315 additions and 220 deletions
--- 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
            {