diff options
| author | Melanie | 2010-02-15 00:20:48 +0000 |
|---|---|---|
| committer | Melanie | 2010-02-15 00:20:48 +0000 |
| commit | c033223c63274ebe41075b24d108ca952fbd242c (patch) | |
| tree | 8c969a9643c469feb37133b175be18eb52fdff49 /OpenSim/Region/CoreModules/World/Estate | |
| parent | Extraneous debug messages removed (diff) | |
| parent | Plug a small hole (diff) | |
| download | opensim-SC_OLD-c033223c63274ebe41075b24d108ca952fbd242c.zip opensim-SC_OLD-c033223c63274ebe41075b24d108ca952fbd242c.tar.gz opensim-SC_OLD-c033223c63274ebe41075b24d108ca952fbd242c.tar.bz2 opensim-SC_OLD-c033223c63274ebe41075b24d108ca952fbd242c.tar.xz | |
Merge branch 'master' into presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Estate')
| -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 189efdc..e3bab2d 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |||
| @@ -955,8 +955,8 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
| 955 | if (y == -1 || m_scene.RegionInfo.RegionLocY == y) | 955 | if (y == -1 || m_scene.RegionInfo.RegionLocY == y) |
| 956 | { | 956 | { |
| 957 | int corner = int.Parse(num); | 957 | int corner = int.Parse(num); |
| 958 | float lowValue = float.Parse(min); | 958 | float lowValue = float.Parse(min, Culture.NumberFormatInfo); |
| 959 | float highValue = float.Parse(max); | 959 | float highValue = float.Parse(max, Culture.NumberFormatInfo); |
| 960 | 960 | ||
| 961 | m_log.Debug("[ESTATEMODULE] Setting terrain heights " + m_scene.RegionInfo.RegionName + | 961 | m_log.Debug("[ESTATEMODULE] Setting terrain heights " + m_scene.RegionInfo.RegionName + |
| 962 | string.Format(" (C{0}, {1}-{2}", corner, lowValue, highValue)); | 962 | string.Format(" (C{0}, {1}-{2}", corner, lowValue, highValue)); |