diff options
author | Justin Clark-Casey (justincc) | 2011-07-29 23:43:35 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-07-29 23:43:35 +0100 |
commit | 6d866ba6d5105365cc5dea901ee18824e90cdc4c (patch) | |
tree | e2fd3481660db93a22e47e4150cf12b7315f466d /OpenSim | |
parent | For all Util.FireAndForget invocations, set thread to en_US before continuing... (diff) | |
download | opensim-SC_OLD-6d866ba6d5105365cc5dea901ee18824e90cdc4c.zip opensim-SC_OLD-6d866ba6d5105365cc5dea901ee18824e90cdc4c.tar.gz opensim-SC_OLD-6d866ba6d5105365cc5dea901ee18824e90cdc4c.tar.bz2 opensim-SC_OLD-6d866ba6d5105365cc5dea901ee18824e90cdc4c.tar.xz |
Temporarily put in a log line which shows which locale the user is running in.
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Application/Application.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs index 3b261e7..c130038 100644 --- a/OpenSim/Region/Application/Application.cs +++ b/OpenSim/Region/Application/Application.cs | |||
@@ -73,6 +73,7 @@ namespace OpenSim | |||
73 | AppDomain.CurrentDomain.UnhandledException += | 73 | AppDomain.CurrentDomain.UnhandledException += |
74 | new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException); | 74 | new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException); |
75 | 75 | ||
76 | |||
76 | // Add the arguments supplied when running the application to the configuration | 77 | // Add the arguments supplied when running the application to the configuration |
77 | ArgvConfigSource configSource = new ArgvConfigSource(args); | 78 | ArgvConfigSource configSource = new ArgvConfigSource(args); |
78 | 79 | ||
@@ -91,6 +92,9 @@ namespace OpenSim | |||
91 | 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"); |
92 | } | 93 | } |
93 | 94 | ||
95 | m_log.DebugFormat( | ||
96 | "[OPENSIM MAIN]: System Locale is {0}", System.Threading.Thread.CurrentThread.CurrentCulture); | ||
97 | |||
94 | // Increase the number of IOCP threads available. Mono defaults to a tragically low number | 98 | // Increase the number of IOCP threads available. Mono defaults to a tragically low number |
95 | int workerThreads, iocpThreads; | 99 | int workerThreads, iocpThreads; |
96 | System.Threading.ThreadPool.GetMaxThreads(out workerThreads, out iocpThreads); | 100 | System.Threading.ThreadPool.GetMaxThreads(out workerThreads, out iocpThreads); |
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 8add2af..259d753 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -130,7 +130,9 @@ namespace OpenSim | |||
130 | //m_log.InfoFormat("[OPENSIM MAIN]: GC Latency Mode: {0}", GCSettings.LatencyMode.ToString()); | 130 | //m_log.InfoFormat("[OPENSIM MAIN]: GC Latency Mode: {0}", GCSettings.LatencyMode.ToString()); |
131 | 131 | ||
132 | if (m_gui) // Driven by external GUI | 132 | if (m_gui) // Driven by external GUI |
133 | { | ||
133 | m_console = new CommandConsole("Region"); | 134 | m_console = new CommandConsole("Region"); |
135 | } | ||
134 | else | 136 | else |
135 | { | 137 | { |
136 | switch (m_consoleType) | 138 | switch (m_consoleType) |