aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorAdam Frisby2009-12-13 03:04:16 +1100
committerAdam Frisby2009-12-13 03:04:16 +1100
commit963cf25813ad2bd6dceaa39757391fbf94d6f09e (patch)
tree80244f3026d0d1c06f4d8e0b496470052353b083 /OpenSim/Region/Framework/Scenes
parent* Bugfix mantis 4441, "Use of Autopilot isn't playing any animations." (diff)
downloadopensim-SC-963cf25813ad2bd6dceaa39757391fbf94d6f09e.zip
opensim-SC-963cf25813ad2bd6dceaa39757391fbf94d6f09e.tar.gz
opensim-SC-963cf25813ad2bd6dceaa39757391fbf94d6f09e.tar.bz2
opensim-SC-963cf25813ad2bd6dceaa39757391fbf94d6f09e.tar.xz
* 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
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs5
1 files changed, 5 insertions, 0 deletions
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
574 574
575 StatsReporter.SetObjectCapacity(objectCapacity); 575 StatsReporter.SetObjectCapacity(objectCapacity);
576 576
577 // Old
578 /*
577 m_simulatorVersion = simulatorVersion 579 m_simulatorVersion = simulatorVersion
578 + " (OS " + Util.GetOperatingSystemInformation() + ")" 580 + " (OS " + Util.GetOperatingSystemInformation() + ")"
579 + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString() 581 + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString()
580 + " PhysPrim:" + m_physicalPrim.ToString(); 582 + " PhysPrim:" + m_physicalPrim.ToString();
583 */
584
585 m_simulatorVersion = simulatorVersion + " (" + Util.GetRuntimeInformation() + ")";
581 586
582 try 587 try
583 { 588 {