From 5a0c9c2fcf76ebe430602885c526f687a64f3cc1 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Thu, 27 Sep 2018 19:04:11 +0100
Subject: more on culture issues

---
 OpenSim/Framework/Culture.cs              | 10 ++++++++++
 OpenSim/Region/Application/Application.cs |  6 +++++-
 OpenSim/Server/ServerMain.cs              |  3 +++
 3 files changed, 18 insertions(+), 1 deletion(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Framework/Culture.cs b/OpenSim/Framework/Culture.cs
index 3d78fac..1a44660 100644
--- a/OpenSim/Framework/Culture.cs
+++ b/OpenSim/Framework/Culture.cs
@@ -52,5 +52,15 @@ namespace OpenSim.Framework
         {
             Thread.CurrentThread.CurrentCulture = m_cultureInfo;
         }
+
+        public static void SetDefaultCurrentCulture()
+        {
+            CultureInfo.DefaultThreadCurrentCulture = m_cultureInfo;
+        }
+
+        public static CultureInfo GetDefaultCurrentCulture()
+        {
+            return CultureInfo.DefaultThreadCurrentCulture;
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index 66ce8e5..e4c3329 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -74,6 +74,9 @@ namespace OpenSim
             AppDomain.CurrentDomain.UnhandledException +=
                 new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
 
+            Culture.SetCurrentCulture();
+            Culture.SetDefaultCurrentCulture();
+
             if(Util.IsWindows())
                 ServicePointManager.DefaultConnectionLimit = 32;
             else
@@ -183,8 +186,9 @@ namespace OpenSim
                 m_log.Warn("[OPENSIM MAIN]: Environment is not supported by OpenSimulator (" + supported + ")\n");
             }
 
+            m_log.InfoFormat("Default culture changed to {0}",Culture.GetDefaultCurrentCulture().DisplayName);
+
             // Configure nIni aliases and localles
-            Culture.SetCurrentCulture();
 
             // Validate that the user has the most basic configuration done
             // If not, offer to do the most basic configuration for them warning them along the way of the importance of
diff --git a/OpenSim/Server/ServerMain.cs b/OpenSim/Server/ServerMain.cs
index 4b7fd8a..09f6920 100644
--- a/OpenSim/Server/ServerMain.cs
+++ b/OpenSim/Server/ServerMain.cs
@@ -77,6 +77,9 @@ namespace OpenSim.Server
 
         public static int Main(string[] args)
         {
+            Culture.SetCurrentCulture();
+            Culture.SetDefaultCurrentCulture();
+
             ServicePointManager.DefaultConnectionLimit = 64;
             ServicePointManager.Expect100Continue = false;
             ServicePointManager.UseNagleAlgorithm = false;
-- 
cgit v1.1