diff options
| author | Melanie | 2009-12-14 00:32:00 +0000 |
|---|---|---|
| committer | Melanie | 2009-12-14 00:32:00 +0000 |
| commit | 0813dc8c1d8ff6a2de04dc48e991e803eb3df260 (patch) | |
| tree | 3aa288c205e41277ef927eac8605dc70845d8065 /OpenSim/Region/Framework | |
| parent | Add an option to exit an instance rather than restarting a region within it (diff) | |
| parent | Tweaking the ModifyLand packet to be async. Advice from Adam (diff) | |
| download | opensim-SC-0813dc8c1d8ff6a2de04dc48e991e803eb3df260.zip opensim-SC-0813dc8c1d8ff6a2de04dc48e991e803eb3df260.tar.gz opensim-SC-0813dc8c1d8ff6a2de04dc48e991e803eb3df260.tar.bz2 opensim-SC-0813dc8c1d8ff6a2de04dc48e991e803eb3df260.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 4241b20..eb284c1 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 | { |