From 2219ccc5b053d5c8885de113488dfb6718903435 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Tue, 25 Sep 2007 01:20:30 +0000
Subject: * Fixed Culture-variant parsing of config options

---
 OpenSim/Region/Application/Application.cs            | 6 +++---
 OpenSim/Region/Application/OpenSimMain.cs            | 2 ++
 OpenSim/Region/Environment/Scenes/Scene.cs           | 7 +------
 OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs | 6 ++++--
 4 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index 572f034..ec7c43d 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -29,6 +29,8 @@ using System;
 using OpenSim.Framework.Console;
 using OpenSim.Region.Environment.Scenes;
 using Nini.Config;
+using System.Threading;
+using OpenSim.Framework;
 
 namespace OpenSim
 {
@@ -55,9 +57,7 @@ namespace OpenSim
             
             Console.WriteLine("Starting...\n");
 
-            // Set current culture
-            
-            System.Threading.Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo(""); // en
+           Culture.SetCurrentCulture();
 
             ArgvConfigSource configSource = new ArgvConfigSource(args);
 
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index d3b4e49..dad6afd 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -44,6 +44,8 @@ using OpenSim.Region.Communications.OGS1;
 using OpenSim.Region.Environment;
 using OpenSim.Region.Environment.Scenes;
 using OpenSim.Region.Physics.Manager;
+using System.Globalization;
+using RegionInfo=OpenSim.Framework.Types.RegionInfo;
 
 namespace OpenSim
 {
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 5849519..5fbe918 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -54,6 +54,7 @@ namespace OpenSim.Region.Environment.Scenes
 {
     public partial class Scene : SceneBase
     {
+
         public delegate bool FilterAvatarList(ScenePresence avatar);
 
         protected Timer m_heartbeatTimer = new Timer();
@@ -160,12 +161,6 @@ namespace OpenSim.Region.Environment.Scenes
 
         #region Constructors
 
-        /// <summary>
-        /// Creates a new Scene class, and a region to go with it.
-        /// </summary>
-        /// <param name="clientThreads">Dictionary to contain client threads</param>
-        /// <param name="regionHandle">Region Handle for this region</param>
-        /// <param name="regionName">Region Name for this region</param>
         public Scene(RegionInfo regInfo, AgentCircuitManager authen, CommunicationsManager commsMan,
                      AssetCache assetCach, StorageManager storeManager, BaseHttpServer httpServer,
                      ModuleLoader moduleLoader)
diff --git a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
index 6454bdc..c3c4935 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
@@ -33,6 +33,8 @@ using System.IO;
 using libTerrain;
 using OpenJPEGNet;
 using OpenSim.Framework.Interfaces;
+using System.Globalization;
+using OpenSim.Framework;
 
 namespace OpenSim.Region.Terrain
 {
@@ -603,8 +605,8 @@ namespace OpenSim.Region.Terrain
             if (args.GetLength(0) > 2)
             {
                 int.TryParse(args[2].ToString(), out count);
-                double.TryParse(args[3].ToString(), out sizeMin);
-                double.TryParse(args[4].ToString(), out sizeRange);
+                double.TryParse(args[3].ToString(), NumberStyles.AllowDecimalPoint, Culture.NumberFormatInfo, out sizeMin);
+                double.TryParse(args[4].ToString(), NumberStyles.AllowDecimalPoint, Culture.NumberFormatInfo, out sizeRange);
                 bool.TryParse(args[5].ToString(), out island);
                 bool.TryParse(args[6].ToString(), out additive);
                 bool.TryParse(args[7].ToString(), out noisy);
-- 
cgit v1.1