Revert r6697 patch as the build fails.

1 files changed, 9 insertions, 15 deletions

diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/ErodeSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/ErodeSphere.cs
index 3fa3f8a..dae4cf8 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/ErodeSphere.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/ErodeSphere.cs
@@ -150,7 +150,7 @@ 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);
 
@@ -173,13 +173,10 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
                 {
                     for (y = 0; y < water.Height; y++)
                     {
-                        if (mask[x,y])
-                        {
-                            const double solConst = (1.0 / rounds);
-                            double sedDelta = water[x, y] * solConst;
-                            map[x, y] -= sedDelta;
-                            sediment[x, y] += sedDelta;
-                        }
+                        const double solConst = (1.0 / rounds);
+                        double sedDelta = water[x, y] * solConst;
+                        map[x, y] -= sedDelta;
+                        sediment[x, y] += sedDelta;
                     }
                 }
 
@@ -295,11 +292,8 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
                         double sedimentDeposit = sediment[x, y] - waterCapacity;
                         if (sedimentDeposit > 0)
                         {
-                            if (mask[x,y])
-                            {
-                                sediment[x, y] -= sedimentDeposit;
-                                map[x, y] += sedimentDeposit;
-                            }
+                            sediment[x, y] -= sedimentDeposit;
+                            map[x, y] += sedimentDeposit;
                         }
                     }
                 }
@@ -308,10 +302,10 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
             // Deposit any remainder (should be minimal)
             for (x = 0; x < water.Width; x++)
                 for (y = 0; y < water.Height; y++)
-                    if (mask[x,y] && sediment[x, y] > 0)
+                    if (sediment[x, y] > 0)
                         map[x, y] += sediment[x, y];
         }
 
         #endregion
     }
-}
+}
\ No newline at end of file