diff options
| author | Melanie | 2010-02-14 22:27:39 +0000 |
|---|---|---|
| committer | Melanie | 2010-02-14 22:27:39 +0000 |
| commit | 2084e08ad7a24908a4465108f2b76ee639c91ae6 (patch) | |
| tree | 1cc1aa8f1c08de402f27036762b9ac2d1eccabfe /OpenSim/Region/CoreModules/World | |
| parent | Resolve a merge issue (diff) | |
| parent | * SQLite match code casing with regionsettings table field casing (what's wit... (diff) | |
| download | opensim-SC-2084e08ad7a24908a4465108f2b76ee639c91ae6.zip opensim-SC-2084e08ad7a24908a4465108f2b76ee639c91ae6.tar.gz opensim-SC-2084e08ad7a24908a4465108f2b76ee639c91ae6.tar.bz2 opensim-SC-2084e08ad7a24908a4465108f2b76ee639c91ae6.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs index 695cced..03da269 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |||
| @@ -974,8 +974,8 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
| 974 | if (y == -1 || m_scene.RegionInfo.RegionLocY == y) | 974 | if (y == -1 || m_scene.RegionInfo.RegionLocY == y) |
| 975 | { | 975 | { |
| 976 | int corner = int.Parse(num); | 976 | int corner = int.Parse(num); |
| 977 | float lowValue = float.Parse(min); | 977 | float lowValue = float.Parse(min, Culture.NumberFormatInfo); |
| 978 | float highValue = float.Parse(max); | 978 | float highValue = float.Parse(max, Culture.NumberFormatInfo); |
| 979 | 979 | ||
| 980 | m_log.Debug("[ESTATEMODULE] Setting terrain heights " + m_scene.RegionInfo.RegionName + | 980 | m_log.Debug("[ESTATEMODULE] Setting terrain heights " + m_scene.RegionInfo.RegionName + |
| 981 | string.Format(" (C{0}, {1}-{2}", corner, lowValue, highValue)); | 981 | string.Format(" (C{0}, {1}-{2}", corner, lowValue, highValue)); |