diff options
author | Charles Krinke | 2008-10-06 00:46:27 +0000 |
---|---|---|
committer | Charles Krinke | 2008-10-06 00:46:27 +0000 |
commit | 4f6cdc08d65cbdd60591d08d71c1c7648a3032cd (patch) | |
tree | c124af14da43a3b6f15d8a96d8ed151cbfca05b5 /OpenSim/Region/Environment/Modules/World/Terrain/Effects | |
parent | Patch by Fly-Man, with modifications. Add more fields to DataSnapshot. (diff) | |
download | opensim-SC_OLD-4f6cdc08d65cbdd60591d08d71c1c7648a3032cd.zip opensim-SC_OLD-4f6cdc08d65cbdd60591d08d71c1c7648a3032cd.tar.gz opensim-SC_OLD-4f6cdc08d65cbdd60591d08d71c1c7648a3032cd.tar.bz2 opensim-SC_OLD-4f6cdc08d65cbdd60591d08d71c1c7648a3032cd.tar.xz |
Mantis#1207. Thank you, TGlion for a patch that addresses:
Implementation of llModifyLand() and There is a bug on
permission-check of land-terraforming: x an y-coordinates
are interchanged on function-call ExternalChecksCanTerraformLand.
Correct: x is west, and y is north. 2) Missing check of
"Other allow to terraform-flag" (Parcel.ParcelFlags.AllowTerraform)
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Terrain/Effects')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Terrain/Effects/CookieCutter.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/Effects/CookieCutter.cs b/OpenSim/Region/Environment/Modules/World/Terrain/Effects/CookieCutter.cs index 399287d..c5e99b5 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/Effects/CookieCutter.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/Effects/CookieCutter.cs | |||
@@ -41,6 +41,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.Effects | |||
41 | bool[,] cliffMask = new bool[map.Width,map.Height]; | 41 | bool[,] cliffMask = new bool[map.Width,map.Height]; |
42 | bool[,] channelMask = new bool[map.Width,map.Height]; | 42 | bool[,] channelMask = new bool[map.Width,map.Height]; |
43 | bool[,] smoothMask = new bool[map.Width,map.Height]; | 43 | bool[,] smoothMask = new bool[map.Width,map.Height]; |
44 | bool[,] allowMask = new bool[map.Width,map.Height]; | ||
44 | 45 | ||
45 | Console.WriteLine("S1"); | 46 | Console.WriteLine("S1"); |
46 | 47 | ||
@@ -52,6 +53,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.Effects | |||
52 | { | 53 | { |
53 | Console.Write("."); | 54 | Console.Write("."); |
54 | smoothMask[x, y] = true; | 55 | smoothMask[x, y] = true; |
56 | allowMask[x,y] = true; | ||
55 | 57 | ||
56 | // Start underwater | 58 | // Start underwater |
57 | map[x, y] = TerrainUtil.PerlinNoise2D(x, y, 3, 0.25) * 5; | 59 | map[x, y] = TerrainUtil.PerlinNoise2D(x, y, 3, 0.25) * 5; |
@@ -77,7 +79,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.Effects | |||
77 | for (y = 0; y < map.Height; y++) | 79 | for (y = 0; y < map.Height; y++) |
78 | { | 80 | { |
79 | if (cliffMask[x, y]) | 81 | if (cliffMask[x, y]) |
80 | eroder.PaintEffect(map, x, y, 4, 0.1); | 82 | eroder.PaintEffect(map, allowMask, x, y, -1, 4, 0.1); |
81 | } | 83 | } |
82 | } | 84 | } |
83 | 85 | ||
@@ -119,4 +121,4 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.Effects | |||
119 | } | 121 | } |
120 | } | 122 | } |
121 | } | 123 | } |
122 | } \ No newline at end of file | 124 | } |