Revert r6697 patch as the build fails.

1 files changed, 8 insertions, 3 deletions

diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/NoiseSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/NoiseSphere.cs
index 23f7bc5..0824efd 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/NoiseSphere.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/NoiseSphere.cs
@@ -35,17 +35,22 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
     {
         #region ITerrainPaintableEffect Members
 
-        public void PaintEffect(ITerrainChannel map, bool[,] mask, double rx, double ry, double rz, double strength, double duration)
+        public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
         {
             strength = TerrainUtil.MetersToSphericalStrength(strength);
 
             int x;
             for (x = 0; x < map.Width; x++)
             {
+                // Skip everything unlikely to be affected
+                if (Math.Abs(x - rx) > strength * 1.1)
+                    continue;
+
                 int y;
                 for (y = 0; y < map.Height; y++)
                 {
-                    if (!mask[x,y])
+                    // Skip everything unlikely to be affected
+                    if (Math.Abs(y - ry) > strength * 1.1)
                         continue;
 
                     // Calculate a sphere and add it to the heighmap
@@ -63,4 +68,4 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
 
         #endregion
     }
-}
+}
\ No newline at end of file