diff options
author | Charles Krinke | 2008-10-06 00:58:43 +0000 |
---|---|---|
committer | Charles Krinke | 2008-10-06 00:58:43 +0000 |
commit | e575ef7ad2245aad17f57273f6bd7b774f99f057 (patch) | |
tree | a85fd727bac7f3d39259df3aaea6c93f3f32ba05 /OpenSim/Region/Environment/Modules/World/Terrain/Effects | |
parent | Mantis#2336. Thank you kindly, Ralphos for a patch that: (diff) | |
download | opensim-SC_OLD-e575ef7ad2245aad17f57273f6bd7b774f99f057.zip opensim-SC_OLD-e575ef7ad2245aad17f57273f6bd7b774f99f057.tar.gz opensim-SC_OLD-e575ef7ad2245aad17f57273f6bd7b774f99f057.tar.bz2 opensim-SC_OLD-e575ef7ad2245aad17f57273f6bd7b774f99f057.tar.xz |
Revert r6697 patch as the build fails.
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, 2 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/Effects/CookieCutter.cs b/OpenSim/Region/Environment/Modules/World/Terrain/Effects/CookieCutter.cs index c5e99b5..399287d 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/Effects/CookieCutter.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/Effects/CookieCutter.cs | |||
@@ -41,7 +41,6 @@ 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]; | ||
45 | 44 | ||
46 | Console.WriteLine("S1"); | 45 | Console.WriteLine("S1"); |
47 | 46 | ||
@@ -53,7 +52,6 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.Effects | |||
53 | { | 52 | { |
54 | Console.Write("."); | 53 | Console.Write("."); |
55 | smoothMask[x, y] = true; | 54 | smoothMask[x, y] = true; |
56 | allowMask[x,y] = true; | ||
57 | 55 | ||
58 | // Start underwater | 56 | // Start underwater |
59 | map[x, y] = TerrainUtil.PerlinNoise2D(x, y, 3, 0.25) * 5; | 57 | map[x, y] = TerrainUtil.PerlinNoise2D(x, y, 3, 0.25) * 5; |
@@ -79,7 +77,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.Effects | |||
79 | for (y = 0; y < map.Height; y++) | 77 | for (y = 0; y < map.Height; y++) |
80 | { | 78 | { |
81 | if (cliffMask[x, y]) | 79 | if (cliffMask[x, y]) |
82 | eroder.PaintEffect(map, allowMask, x, y, -1, 4, 0.1); | 80 | eroder.PaintEffect(map, x, y, 4, 0.1); |
83 | } | 81 | } |
84 | } | 82 | } |
85 | 83 | ||
@@ -121,4 +119,4 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.Effects | |||
121 | } | 119 | } |
122 | } | 120 | } |
123 | } | 121 | } |
124 | } | 122 | } \ No newline at end of file |