* Fixed Culture-variant parsing of config options

3 files changed, 34 insertions, 5 deletions

diff --git a/OpenSim/Framework/General/Configuration/ConfigurationMember.cs b/OpenSim/Framework/General/Configuration/ConfigurationMember.cs
index c94fd8e..e4c13ba 100644
--- a/OpenSim/Framework/General/Configuration/ConfigurationMember.cs
+++ b/OpenSim/Framework/General/Configuration/ConfigurationMember.cs
@@ -9,6 +9,7 @@ using libsecondlife;
 
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Configuration.Interfaces;
+using System.Globalization;
 
 namespace OpenSim.Framework.Configuration
 {
@@ -295,7 +296,7 @@ namespace OpenSim.Framework.Configuration
                             break;
                         case ConfigurationOption.ConfigurationTypes.TYPE_FLOAT:
                             float floatResult;
-                            if (float.TryParse(console_result, out floatResult))
+                            if (float.TryParse(console_result, NumberStyles.AllowDecimalPoint, Culture.NumberFormatInfo, out floatResult))
                             {
                                 convertSuccess = true;
                                 return_result = floatResult;
@@ -304,7 +305,7 @@ namespace OpenSim.Framework.Configuration
                             break;
                         case ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE:
                             double doubleResult;
-                            if (Double.TryParse(console_result, out doubleResult))
+                            if (Double.TryParse(console_result, NumberStyles.AllowDecimalPoint, Culture.NumberFormatInfo, out doubleResult))
                             {
                                 convertSuccess = true;
                                 return_result = doubleResult;
@@ -332,12 +333,12 @@ namespace OpenSim.Framework.Configuration
                     {
                         if (configOption.configurationUseDefaultNoPrompt)
                         {
-                            MainLog.Instance.Error("Default given for '" + configOption.configurationKey + "' is not valid; the configuration result must be " + errorMessage + ". Will skip this option...");
+                            MainLog.Instance.Error("CONFIG", string.Format("[{3}]:[{1}] is not valid default for parameter [{0}].\nThe configuration result must be parsable to {2}.\n", configOption.configurationKey, console_result, errorMessage, configurationFilename));
                             convertSuccess = true;
                         }
                         else
                         {
-                            MainLog.Instance.Warn("configuration","Incorrect result given, the configuration option must be " + errorMessage + ". Prompting for same option...");
+                            MainLog.Instance.Warn("CONFIG", string.Format("[{3}]:[{1}] is not a valid value [{0}].\nThe configuration result must be parsable to {2}.\n", configOption.configurationKey, console_result, errorMessage, configurationFilename));
                             ignoreNextFromConfig = true;
                         }
                     }
diff --git a/OpenSim/Framework/General/Culture.cs b/OpenSim/Framework/General/Culture.cs
new file mode 100644
index 0000000..8f8561b
--- /dev/null
+++ b/OpenSim/Framework/General/Culture.cs
@@ -0,0 +1,26 @@
+using System;

+using System.Collections.Generic;

+using System.Globalization;

+using System.Text;

+using System.Threading;

+

+namespace OpenSim.Framework

+{

+    public class Culture

+    {

+        private static readonly CultureInfo m_cultureInfo = new System.Globalization.CultureInfo("en-US", true);

+

+        public static NumberFormatInfo NumberFormatInfo

+        {

+            get

+            {

+                return m_cultureInfo.NumberFormat;

+            }

+        }

+

+        public static void SetCurrentCulture()

+        {

+            Thread.CurrentThread.CurrentCulture = m_cultureInfo;

+        }

+    }

+}

diff --git a/OpenSim/Framework/General/Types/EstateSettings.cs b/OpenSim/Framework/General/Types/EstateSettings.cs
index a8f6bf1..abdcf6f 100644
--- a/OpenSim/Framework/General/Types/EstateSettings.cs
+++ b/OpenSim/Framework/General/Types/EstateSettings.cs
@@ -29,6 +29,7 @@ using System.IO;
 using libsecondlife;
 using OpenSim.Framework.Configuration;
 using OpenSim.Framework.Utilities;
+using System.Globalization;
 
 namespace OpenSim.Framework.Types
 {
@@ -719,7 +720,8 @@ namespace OpenSim.Framework.Types
                     this.m_terrainMultiplier = System.Convert.ToDouble(configuration_result);
                     break;
                 case "water_height":
-                    float.TryParse(((double)configuration_result).ToString(),out this.m_waterHeight);
+                    double tmpVal = (double) configuration_result;
+                    this.m_waterHeight = (float) tmpVal;
                     break;
                 case "terrain_image_id":
                     this.m_terrainImageID = (LLUUID)configuration_result;