diff options
| author | Adam Frisby | 2009-09-24 21:46:41 +1000 |
|---|---|---|
| committer | Adam Frisby | 2009-09-24 21:46:41 +1000 |
| commit | 8605c5d2eb0d514c1475b94120fd6db9644874cf (patch) | |
| tree | dfdd9d5a688854144572057f40e944fd60341f32 /OpenSim | |
| parent | * Fixing typo. (diff) | |
| download | opensim-SC_OLD-8605c5d2eb0d514c1475b94120fd6db9644874cf.zip opensim-SC_OLD-8605c5d2eb0d514c1475b94120fd6db9644874cf.tar.gz opensim-SC_OLD-8605c5d2eb0d514c1475b94120fd6db9644874cf.tar.bz2 opensim-SC_OLD-8605c5d2eb0d514c1475b94120fd6db9644874cf.tar.xz | |
* Establishing why new console commands fail to work. >_>
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs index fa52334..bb77bd5 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |||
| @@ -852,10 +852,11 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
| 852 | int x = (args.Length > 5 ? int.Parse(args[5]) : -1); | 852 | int x = (args.Length > 5 ? int.Parse(args[5]) : -1); |
| 853 | int y = (args.Length > 6 ? int.Parse(args[6]) : -1); | 853 | int y = (args.Length > 6 ? int.Parse(args[6]) : -1); |
| 854 | 854 | ||
| 855 | if (x != -1 && m_scene.RegionInfo.RegionLocX != x) | 855 | if (x == -1 || m_scene.RegionInfo.RegionLocX == x) |
| 856 | { | 856 | { |
| 857 | if (y != -1 && m_scene.RegionInfo.RegionLocY != y) | 857 | if (y == -1 || m_scene.RegionInfo.RegionLocY == y) |
| 858 | { | 858 | { |
| 859 | m_log.Debug("[ESTATEMODULE] Setting terrain textures for " + m_scene.RegionInfo.RegionName); | ||
| 859 | setEstateTerrainBaseTexture(null, int.Parse(num), UUID.Parse(uuid)); | 860 | setEstateTerrainBaseTexture(null, int.Parse(num), UUID.Parse(uuid)); |
| 860 | } | 861 | } |
| 861 | } | 862 | } |
| @@ -869,10 +870,11 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
| 869 | int x = (args.Length > 6 ? int.Parse(args[6]) : -1); | 870 | int x = (args.Length > 6 ? int.Parse(args[6]) : -1); |
| 870 | int y = (args.Length > 7 ? int.Parse(args[7]) : -1); | 871 | int y = (args.Length > 7 ? int.Parse(args[7]) : -1); |
| 871 | 872 | ||
| 872 | if (x != -1 && m_scene.RegionInfo.RegionLocX != x) | 873 | if (x == -1 || m_scene.RegionInfo.RegionLocX == x) |
| 873 | { | 874 | { |
| 874 | if (y != -1 && m_scene.RegionInfo.RegionLocY != y) | 875 | if (y == -1 || m_scene.RegionInfo.RegionLocY == y) |
| 875 | { | 876 | { |
| 877 | m_log.Debug("[ESTATEMODULE] Setting terrain heights " + m_scene.RegionInfo.RegionName); | ||
| 876 | setEstateTerrainTextureHeights(null, int.Parse(num), float.Parse(min), float.Parse(max)); | 878 | setEstateTerrainTextureHeights(null, int.Parse(num), float.Parse(min), float.Parse(max)); |
| 877 | } | 879 | } |
| 878 | } | 880 | } |