From a7b49084addb2ec5a407903ef2abfdd8c9374e23 Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Thu, 28 May 2009 15:27:15 +0000 Subject: [PATCH] * May make the terrain flatten brush behave like Second Life(tm)'s client expects. May break everything. You decide! --- .../CoreModules/World/Terrain/PaintBrushes/FlattenSphere.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/FlattenSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/FlattenSphere.cs index 928a5952fb..fbb57dac92 100644 --- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/FlattenSphere.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/FlattenSphere.cs @@ -41,10 +41,13 @@ namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes int x, y; + duration = 0.009; //MCP Should be read from ini file + + // Disabled - just use the client value. + /* if (rz < 0) { double sum = 0.0; double step2 = 0.0; - duration = 0.009; //MCP Should be read from ini file // compute delta map @@ -63,6 +66,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes } rz = sum / step2; } + */ // blend in map