diff options
author | UbitUmarov | 2012-07-17 00:54:23 +0100 |
---|---|---|
committer | UbitUmarov | 2012-07-17 00:54:23 +0100 |
commit | d5f4fb7b50fb7c594b018f8241399e22f88fc951 (patch) | |
tree | 8f3dab3d170596f02b1d1d836a0bc08a3e6b8ebd /OpenSim/Region/Application/Application.cs | |
parent | UbitOde: remove useless water collider from active code. (diff) | |
parent | Merge branch 'avination' into careminster (diff) | |
download | opensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.zip opensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.tar.gz opensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.tar.bz2 opensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.tar.xz |
Merge branch 'avination' into ubitwork
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/Application.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs index c130038..ebfebc4 100644 --- a/OpenSim/Region/Application/Application.cs +++ b/OpenSim/Region/Application/Application.cs | |||
@@ -92,9 +92,14 @@ namespace OpenSim | |||
92 | m_log.Info("[OPENSIM MAIN]: configured log4net using default OpenSim.exe.config"); | 92 | m_log.Info("[OPENSIM MAIN]: configured log4net using default OpenSim.exe.config"); |
93 | } | 93 | } |
94 | 94 | ||
95 | m_log.DebugFormat( | 95 | m_log.InfoFormat( |
96 | "[OPENSIM MAIN]: System Locale is {0}", System.Threading.Thread.CurrentThread.CurrentCulture); | 96 | "[OPENSIM MAIN]: System Locale is {0}", System.Threading.Thread.CurrentThread.CurrentCulture); |
97 | 97 | ||
98 | string monoThreadsPerCpu = System.Environment.GetEnvironmentVariable("MONO_THREADS_PER_CPU"); | ||
99 | |||
100 | m_log.InfoFormat( | ||
101 | "[OPENSIM MAIN]: Environment variable MONO_THREADS_PER_CPU is {0}", monoThreadsPerCpu ?? "unset"); | ||
102 | |||
98 | // Increase the number of IOCP threads available. Mono defaults to a tragically low number | 103 | // Increase the number of IOCP threads available. Mono defaults to a tragically low number |
99 | int workerThreads, iocpThreads; | 104 | int workerThreads, iocpThreads; |
100 | System.Threading.ThreadPool.GetMaxThreads(out workerThreads, out iocpThreads); | 105 | System.Threading.ThreadPool.GetMaxThreads(out workerThreads, out iocpThreads); |
@@ -109,7 +114,6 @@ namespace OpenSim | |||
109 | 114 | ||
110 | // Check if the system is compatible with OpenSimulator. | 115 | // Check if the system is compatible with OpenSimulator. |
111 | // Ensures that the minimum system requirements are met | 116 | // Ensures that the minimum system requirements are met |
112 | m_log.Info("Performing compatibility checks... \n"); | ||
113 | string supported = String.Empty; | 117 | string supported = String.Empty; |
114 | if (Util.IsEnvironmentSupported(ref supported)) | 118 | if (Util.IsEnvironmentSupported(ref supported)) |
115 | { | 119 | { |