diff options
author | Melanie | 2012-05-31 03:35:24 +0100 |
---|---|---|
committer | Melanie | 2012-05-31 03:35:24 +0100 |
commit | e80161753f3a86acec96c5015641543fb4965cc1 (patch) | |
tree | ae9c6e9b913c0fcf6dd800c52363b9ea320373e1 /OpenSim/Region/Application/OpenSim.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Add an optional mechanism for physics modules to collect and return arbitrary... (diff) | |
download | opensim-SC_OLD-e80161753f3a86acec96c5015641543fb4965cc1.zip opensim-SC_OLD-e80161753f3a86acec96c5015641543fb4965cc1.tar.gz opensim-SC_OLD-e80161753f3a86acec96c5015641543fb4965cc1.tar.bz2 opensim-SC_OLD-e80161753f3a86acec96c5015641543fb4965cc1.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Application/OpenSim.cs')
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index daae3e6..caf74cf 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -28,6 +28,7 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Diagnostics; | ||
31 | using System.IO; | 32 | using System.IO; |
32 | using System.Reflection; | 33 | using System.Reflection; |
33 | using System.Text; | 34 | using System.Text; |
@@ -138,7 +139,7 @@ namespace OpenSim | |||
138 | m_log.Info("===================================================================="); | 139 | m_log.Info("===================================================================="); |
139 | m_log.Info("========================= STARTING OPENSIM ========================="); | 140 | m_log.Info("========================= STARTING OPENSIM ========================="); |
140 | m_log.Info("===================================================================="); | 141 | m_log.Info("===================================================================="); |
141 | 142 | ||
142 | //m_log.InfoFormat("[OPENSIM MAIN]: GC Is Server GC: {0}", GCSettings.IsServerGC.ToString()); | 143 | //m_log.InfoFormat("[OPENSIM MAIN]: GC Is Server GC: {0}", GCSettings.IsServerGC.ToString()); |
143 | // http://msdn.microsoft.com/en-us/library/bb384202.aspx | 144 | // http://msdn.microsoft.com/en-us/library/bb384202.aspx |
144 | //GCSettings.LatencyMode = GCLatencyMode.Batch; | 145 | //GCSettings.LatencyMode = GCLatencyMode.Batch; |