diff options
* Fixed Culture-variant parsing of config options
Diffstat (limited to 'OpenSim/Framework/General/Types/EstateSettings.cs')
-rw-r--r-- | OpenSim/Framework/General/Types/EstateSettings.cs | 4 |
1 files changed, 3 insertions, 1 deletions
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; | |||
29 | using libsecondlife; | 29 | using libsecondlife; |
30 | using OpenSim.Framework.Configuration; | 30 | using OpenSim.Framework.Configuration; |
31 | using OpenSim.Framework.Utilities; | 31 | using OpenSim.Framework.Utilities; |
32 | using System.Globalization; | ||
32 | 33 | ||
33 | namespace OpenSim.Framework.Types | 34 | namespace OpenSim.Framework.Types |
34 | { | 35 | { |
@@ -719,7 +720,8 @@ namespace OpenSim.Framework.Types | |||
719 | this.m_terrainMultiplier = System.Convert.ToDouble(configuration_result); | 720 | this.m_terrainMultiplier = System.Convert.ToDouble(configuration_result); |
720 | break; | 721 | break; |
721 | case "water_height": | 722 | case "water_height": |
722 | float.TryParse(((double)configuration_result).ToString(),out this.m_waterHeight); | 723 | double tmpVal = (double) configuration_result; |
724 | this.m_waterHeight = (float) tmpVal; | ||
723 | break; | 725 | break; |
724 | case "terrain_image_id": | 726 | case "terrain_image_id": |
725 | this.m_terrainImageID = (LLUUID)configuration_result; | 727 | this.m_terrainImageID = (LLUUID)configuration_result; |