aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorAdam Frisby2009-05-28 15:27:15 +0000
committerAdam Frisby2009-05-28 15:27:15 +0000
commita7b49084addb2ec5a407903ef2abfdd8c9374e23 (patch)
tree5f8bc4737c4e97400bf5e862ad93bc680a223755 /OpenSim
parentThis may bring the missing texture back. (diff)
downloadopensim-SC-a7b49084addb2ec5a407903ef2abfdd8c9374e23.zip
opensim-SC-a7b49084addb2ec5a407903ef2abfdd8c9374e23.tar.gz
opensim-SC-a7b49084addb2ec5a407903ef2abfdd8c9374e23.tar.bz2
opensim-SC-a7b49084addb2ec5a407903ef2abfdd8c9374e23.tar.xz
* May make the terrain flatten brush behave like Second Life(tm)'s client expects. May break everything. You decide!
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/FlattenSphere.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/FlattenSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/FlattenSphere.cs
index 928a595..fbb57da 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
41 41
42 int x, y; 42 int x, y;
43 43
44 duration = 0.009; //MCP Should be read from ini file
45
46 // Disabled - just use the client value.
47 /*
44 if (rz < 0) { 48 if (rz < 0) {
45 double sum = 0.0; 49 double sum = 0.0;
46 double step2 = 0.0; 50 double step2 = 0.0;
47 duration = 0.009; //MCP Should be read from ini file
48 51
49 52
50 // compute delta map 53 // compute delta map
@@ -63,6 +66,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
63 } 66 }
64 rz = sum / step2; 67 rz = sum / step2;
65 } 68 }
69 */
66 70
67 71
68 // blend in map 72 // blend in map