diff options
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/EstateSettings.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs index 997caad..aa8688b 100644 --- a/OpenSim/Framework/EstateSettings.cs +++ b/OpenSim/Framework/EstateSettings.cs | |||
@@ -62,7 +62,7 @@ namespace OpenSim.Framework | |||
62 | private int m_redirectGridY; | 62 | private int m_redirectGridY; |
63 | private bool m_regionAllowTerraform; | 63 | private bool m_regionAllowTerraform; |
64 | private Simulator.RegionFlags m_regionFlags; | 64 | private Simulator.RegionFlags m_regionFlags; |
65 | private ushort m_regionWaterHeight; | 65 | private float m_regionWaterHeight; |
66 | private Simulator.SimAccess m_simAccess; | 66 | private Simulator.SimAccess m_simAccess; |
67 | private float m_sunHour; | 67 | private float m_sunHour; |
68 | private LLVector3 m_sunPosition; | 68 | private LLVector3 m_sunPosition; |
@@ -256,7 +256,7 @@ namespace OpenSim.Framework | |||
256 | } | 256 | } |
257 | 257 | ||
258 | 258 | ||
259 | public ushort regionWaterHeight | 259 | public float regionWaterHeight |
260 | { | 260 | { |
261 | get { return m_regionWaterHeight; } | 261 | get { return m_regionWaterHeight; } |
262 | set | 262 | set |
@@ -781,7 +781,7 @@ namespace OpenSim.Framework | |||
781 | configMember.addConfigurationOption("price_per_meter", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, | 781 | configMember.addConfigurationOption("price_per_meter", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, |
782 | String.Empty, "1", true); | 782 | String.Empty, "1", true); |
783 | configMember.addConfigurationOption("region_water_height", | 783 | configMember.addConfigurationOption("region_water_height", |
784 | ConfigurationOption.ConfigurationTypes.TYPE_UINT16, String.Empty, "20", true); | 784 | ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "20", true); |
785 | configMember.addConfigurationOption("region_allow_terraform", | 785 | configMember.addConfigurationOption("region_allow_terraform", |
786 | ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, String.Empty, "true", true); | 786 | ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, String.Empty, "true", true); |
787 | 787 | ||
@@ -903,7 +903,7 @@ namespace OpenSim.Framework | |||
903 | m_pricePerMeter = Convert.ToInt32(configuration_result); | 903 | m_pricePerMeter = Convert.ToInt32(configuration_result); |
904 | break; | 904 | break; |
905 | case "region_water_height": | 905 | case "region_water_height": |
906 | m_regionWaterHeight = (ushort) configuration_result; | 906 | m_regionWaterHeight = (float) configuration_result; |
907 | break; | 907 | break; |
908 | case "region_allow_terraform": | 908 | case "region_allow_terraform": |
909 | m_regionAllowTerraform = (bool) configuration_result; | 909 | m_regionAllowTerraform = (bool) configuration_result; |