aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/OlsenSphere.cs
diff options
context:
space:
mode:
authorCharles Krinke2008-10-06 00:58:43 +0000
committerCharles Krinke2008-10-06 00:58:43 +0000
commite575ef7ad2245aad17f57273f6bd7b774f99f057 (patch)
treea85fd727bac7f3d39259df3aaea6c93f3f32ba05 /OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/OlsenSphere.cs
parentMantis#2336. Thank you kindly, Ralphos for a patch that: (diff)
downloadopensim-SC-e575ef7ad2245aad17f57273f6bd7b774f99f057.zip
opensim-SC-e575ef7ad2245aad17f57273f6bd7b774f99f057.tar.gz
opensim-SC-e575ef7ad2245aad17f57273f6bd7b774f99f057.tar.bz2
opensim-SC-e575ef7ad2245aad17f57273f6bd7b774f99f057.tar.xz
Revert r6697 patch as the build fails.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/OlsenSphere.cs')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/OlsenSphere.cs7
1 files changed, 2 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/OlsenSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/OlsenSphere.cs
index 42ec794..6df8408 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/OlsenSphere.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/OlsenSphere.cs
@@ -151,7 +151,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
151 151
152 #region ITerrainPaintableEffect Members 152 #region ITerrainPaintableEffect Members
153 153
154 public void PaintEffect(ITerrainChannel map, bool[,] mask, double rx, double ry, double rz, double strength, double duration) 154 public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
155 { 155 {
156 strength = TerrainUtil.MetersToSphericalStrength(strength); 156 strength = TerrainUtil.MetersToSphericalStrength(strength);
157 157
@@ -162,9 +162,6 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
162 int y; 162 int y;
163 for (y = 0; y < map.Height; y++) 163 for (y = 0; y < map.Height; y++)
164 { 164 {
165 if (!mask[x,y])
166 continue;
167
168 double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength); 165 double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength);
169 166
170 if (z > 0) // add in non-zero amount 167 if (z > 0) // add in non-zero amount
@@ -219,4 +216,4 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
219 216
220 #endregion 217 #endregion
221 } 218 }
222} 219} \ No newline at end of file