1 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
index b5901e1..6ba4c5a 100644
--- a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
@@ -109,7 +109,7 @@ namespace OpenSim.Framework.Serialization.External
                        settings.AgentLimit = int.Parse(xtr.ReadElementContentAsString());
                        break;
                    case "ObjectBonus":
-                        settings.ObjectBonus = double.Parse(xtr.ReadElementContentAsString());
+                        settings.ObjectBonus = double.Parse(xtr.ReadElementContentAsString(), Culture.NumberFormatInfo);
                        break;
                }
            }
@@ -134,28 +134,28 @@ namespace OpenSim.Framework.Serialization.External
                        settings.TerrainTexture4 = UUID.Parse(xtr.ReadElementContentAsString());
                        break;
                    case "ElevationLowSW":
-                        settings.Elevation1SW = double.Parse(xtr.ReadElementContentAsString());
+                        settings.Elevation1SW = double.Parse(xtr.ReadElementContentAsString(), Culture.NumberFormatInfo);
                        break;
                    case "ElevationLowNW":
-                        settings.Elevation1NW = double.Parse(xtr.ReadElementContentAsString());
+                        settings.Elevation1NW = double.Parse(xtr.ReadElementContentAsString(), Culture.NumberFormatInfo);
                        break;
                    case "ElevationLowSE":
-                        settings.Elevation1SE = double.Parse(xtr.ReadElementContentAsString());
+                        settings.Elevation1SE = double.Parse(xtr.ReadElementContentAsString(), Culture.NumberFormatInfo);
                        break;
                    case "ElevationLowNE":
-                        settings.Elevation1NE = double.Parse(xtr.ReadElementContentAsString());
+                        settings.Elevation1NE = double.Parse(xtr.ReadElementContentAsString(), Culture.NumberFormatInfo);
                        break;
                    case "ElevationHighSW":
-                        settings.Elevation2SW = double.Parse(xtr.ReadElementContentAsString());
+                        settings.Elevation2SW = double.Parse(xtr.ReadElementContentAsString(), Culture.NumberFormatInfo);
                        break;
                    case "ElevationHighNW":
-                        settings.Elevation2NW = double.Parse(xtr.ReadElementContentAsString());
+                        settings.Elevation2NW = double.Parse(xtr.ReadElementContentAsString(), Culture.NumberFormatInfo);
                        break;
                    case "ElevationHighSE":
-                        settings.Elevation2SE = double.Parse(xtr.ReadElementContentAsString());
+                        settings.Elevation2SE = double.Parse(xtr.ReadElementContentAsString(), Culture.NumberFormatInfo);
                        break;
                    case "ElevationHighNE":
-                        settings.Elevation2NE = double.Parse(xtr.ReadElementContentAsString());
+                        settings.Elevation2NE = double.Parse(xtr.ReadElementContentAsString(), Culture.NumberFormatInfo);
                        break;
                }
            }
@@ -168,13 +168,13 @@ namespace OpenSim.Framework.Serialization.External
                switch (xtr.Name)
                {
                    case "WaterHeight":
-                        settings.WaterHeight = double.Parse(xtr.ReadElementContentAsString());
+                        settings.WaterHeight = double.Parse(xtr.ReadElementContentAsString(), Culture.NumberFormatInfo);
                        break;
                    case "TerrainRaiseLimit":
-                        settings.TerrainRaiseLimit = double.Parse(xtr.ReadElementContentAsString());
+                        settings.TerrainRaiseLimit = double.Parse(xtr.ReadElementContentAsString(), Culture.NumberFormatInfo);
                        break;
                    case "TerrainLowerLimit":
-                        settings.TerrainLowerLimit = double.Parse(xtr.ReadElementContentAsString());
+                        settings.TerrainLowerLimit = double.Parse(xtr.ReadElementContentAsString(), Culture.NumberFormatInfo);
                        break;
                    case "UseEstateSun":
                        settings.UseEstateSun = bool.Parse(xtr.ReadElementContentAsString());

diff --git a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs index b5901e1..6ba4c5a 100644 --- a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs +++ b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
@@ -109,7 +109,7 @@ namespace OpenSim.Framework.Serialization.External
109	settings.AgentLimit = int.Parse(xtr.ReadElementContentAsString());	109	settings.AgentLimit = int.Parse(xtr.ReadElementContentAsString());
110	break;	110	break;
111	case "ObjectBonus":	111	case "ObjectBonus":
112	settings.ObjectBonus = double.Parse(xtr.ReadElementContentAsString());	112	settings.ObjectBonus = double.Parse(xtr.ReadElementContentAsString(), Culture.NumberFormatInfo);
113	break;	113	break;
114	}	114	}
115	}	115	}
@@ -134,28 +134,28 @@ namespace OpenSim.Framework.Serialization.External
134	settings.TerrainTexture4 = UUID.Parse(xtr.ReadElementContentAsString());	134	settings.TerrainTexture4 = UUID.Parse(xtr.ReadElementContentAsString());
135	break;	135	break;
136	case "ElevationLowSW":	136	case "ElevationLowSW":
137	settings.Elevation1SW = double.Parse(xtr.ReadElementContentAsString());	137	settings.Elevation1SW = double.Parse(xtr.ReadElementContentAsString(), Culture.NumberFormatInfo);
138	break;	138	break;
139	case "ElevationLowNW":	139	case "ElevationLowNW":
140	settings.Elevation1NW = double.Parse(xtr.ReadElementContentAsString());	140	settings.Elevation1NW = double.Parse(xtr.ReadElementContentAsString(), Culture.NumberFormatInfo);
141	break;	141	break;
142	case "ElevationLowSE":	142	case "ElevationLowSE":
143	settings.Elevation1SE = double.Parse(xtr.ReadElementContentAsString());	143	settings.Elevation1SE = double.Parse(xtr.ReadElementContentAsString(), Culture.NumberFormatInfo);
144	break;	144	break;
145	case "ElevationLowNE":	145	case "ElevationLowNE":
146	settings.Elevation1NE = double.Parse(xtr.ReadElementContentAsString());	146	settings.Elevation1NE = double.Parse(xtr.ReadElementContentAsString(), Culture.NumberFormatInfo);
147	break;	147	break;
148	case "ElevationHighSW":	148	case "ElevationHighSW":
149	settings.Elevation2SW = double.Parse(xtr.ReadElementContentAsString());	149	settings.Elevation2SW = double.Parse(xtr.ReadElementContentAsString(), Culture.NumberFormatInfo);
150	break;	150	break;
151	case "ElevationHighNW":	151	case "ElevationHighNW":
152	settings.Elevation2NW = double.Parse(xtr.ReadElementContentAsString());	152	settings.Elevation2NW = double.Parse(xtr.ReadElementContentAsString(), Culture.NumberFormatInfo);
153	break;	153	break;
154	case "ElevationHighSE":	154	case "ElevationHighSE":
155	settings.Elevation2SE = double.Parse(xtr.ReadElementContentAsString());	155	settings.Elevation2SE = double.Parse(xtr.ReadElementContentAsString(), Culture.NumberFormatInfo);
156	break;	156	break;
157	case "ElevationHighNE":	157	case "ElevationHighNE":
158	settings.Elevation2NE = double.Parse(xtr.ReadElementContentAsString());	158	settings.Elevation2NE = double.Parse(xtr.ReadElementContentAsString(), Culture.NumberFormatInfo);
159	break;	159	break;
160	}	160	}
161	}	161	}
@@ -168,13 +168,13 @@ namespace OpenSim.Framework.Serialization.External
168	switch (xtr.Name)	168	switch (xtr.Name)
169	{	169	{
170	case "WaterHeight":	170	case "WaterHeight":
171	settings.WaterHeight = double.Parse(xtr.ReadElementContentAsString());	171	settings.WaterHeight = double.Parse(xtr.ReadElementContentAsString(), Culture.NumberFormatInfo);
172	break;	172	break;
173	case "TerrainRaiseLimit":	173	case "TerrainRaiseLimit":
174	settings.TerrainRaiseLimit = double.Parse(xtr.ReadElementContentAsString());	174	settings.TerrainRaiseLimit = double.Parse(xtr.ReadElementContentAsString(), Culture.NumberFormatInfo);
175	break;	175	break;
176	case "TerrainLowerLimit":	176	case "TerrainLowerLimit":
177	settings.TerrainLowerLimit = double.Parse(xtr.ReadElementContentAsString());	177	settings.TerrainLowerLimit = double.Parse(xtr.ReadElementContentAsString(), Culture.NumberFormatInfo);
178	break;	178	break;
179	case "UseEstateSun":	179	case "UseEstateSun":
180	settings.UseEstateSun = bool.Parse(xtr.ReadElementContentAsString());	180	settings.UseEstateSun = bool.Parse(xtr.ReadElementContentAsString());