aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2008-10-26 23:09:00 +0000
committerMelanie Thielker2008-10-26 23:09:00 +0000
commitcc48110a03e904974335eb166f8109e0557e4ec4 (patch)
treeb027bf5398e94fba40645fa61ca5acdc9933a668
parentCommitting a small fix for EventData along with more plumbing work (diff)
downloadopensim-SC_OLD-cc48110a03e904974335eb166f8109e0557e4ec4.zip
opensim-SC_OLD-cc48110a03e904974335eb166f8109e0557e4ec4.tar.gz
opensim-SC_OLD-cc48110a03e904974335eb166f8109e0557e4ec4.tar.bz2
opensim-SC_OLD-cc48110a03e904974335eb166f8109e0557e4ec4.tar.xz
Mantis #2428
Thank you, miceakitsune, for a patch that makes terraforming tools usable again
-rw-r--r--OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/Terrain/TerrainUtil.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs
index c63cb90..0b4996f 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
42 42
43 double area = strength; 43 double area = strength;
44 double step = strength / 4.0; 44 double step = strength / 4.0;
45 duration = 0.0045; //MCP Should be read from ini file 45 duration = 0.03; //MCP Should be read from ini file
46 46
47 47
48 // compute delta map 48 // compute delta map
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainUtil.cs b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainUtil.cs
index 2e6595a..b20ff42 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainUtil.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainUtil.cs
@@ -35,7 +35,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain
35 public static double MetersToSphericalStrength(double size) 35 public static double MetersToSphericalStrength(double size)
36 { 36 {
37 //return Math.Pow(2, size); 37 //return Math.Pow(2, size);
38 return (size + 1) * 2.5; // MCP: a more useful brush size range 38 return (size + 1) * 1.35; // MCP: a more useful brush size range
39 } 39 }
40 40
41 public static double SphericalFactor(double x, double y, double rx, double ry, double size) 41 public static double SphericalFactor(double x, double y, double rx, double ry, double size)