reverting r6302

3 files changed, 3 insertions, 6 deletions

diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs
index e1d651b..7bf88f0 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs
@@ -42,7 +42,6 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
 
             double sum = 0.0;
             double step2 = 0.0;
-            double durationFactor = 0.15; //MCP: tuned, but would be nice to come from ini file
 
             // compute delta map
             for (x = 0; x < map.Width; x++)
@@ -66,7 +65,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
             {
                 for (y = 0; y < map.Height; y++)
                 {
-                    double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength) * duration * durationFactor;
+                    double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength) * duration;
 
                     if (z > 0) // add in non-zero amount
                     {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs
index fa0389d..fc0a579 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs
@@ -42,7 +42,6 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
 
             double area = strength;
             double step = strength / 4.0;
-            double durationFactor = 0.15; //MCP: tuned, but would be nice to come from ini file
 
             // compute delta map
             for (x = 0; x < map.Width; x++)
@@ -81,7 +80,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
                     {
                         double da = z;
                         double a = (map[x, y] - tweak[x, y]) * da;
-                        double newz = map[x, y] - (a * duration * durationFactor);
+                        double newz = map[x, y] - (a * duration);
 
                         if (newz > 0.0)
                             map[x, y] = newz;
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainUtil.cs b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainUtil.cs
index 797c6a0..def28eb 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainUtil.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainUtil.cs
@@ -34,8 +34,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain
     {
         public static double MetersToSphericalStrength(double size)
         {
-            //return Math.Pow(2, size);
-            return (size + 1) * 2.0; // MCP: a more useful brush size range
+            return Math.Pow(2, size);
         }
 
         public static double SphericalFactor(double x, double y, double rx, double ry, double size)