From 832243c6e8ccfe817dd2b1e66afd6cb316a7a1fb Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Tue, 29 Jan 2008 06:16:06 +0000 Subject: [PATCH] * No more massive spires and massive pits when editing land using Select + tool + amount + apply; --- OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs index 7605122542..280ca0d3df 100644 --- a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs +++ b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs @@ -165,7 +165,11 @@ namespace OpenSim.Region.Terrain { // Shiny. double size = (double) (1 << brushsize); - + //System.Console.WriteLine("SIZE:" + size.ToString() + " Seconds:" + seconds.ToString()); + if (seconds == 1) + { + seconds = 0.0315f; + } /* Okay, so here's the deal * This has to handle both when a user draws on the terrain *and* when a user selects * a selection of AABB on terrain and applies whatever routine the client requests @@ -202,6 +206,8 @@ namespace OpenSim.Region.Terrain { FlattenTerrain(y, x, size, (double) seconds/5.0); lastEdit = DateTime.Now; + remoteUser.SendLayerData((int)(x / 16), (int)(x / 16), GetHeights1D()); + } } break; @@ -213,6 +219,7 @@ namespace OpenSim.Region.Terrain { RaiseTerrain(y, x, size, (double) seconds/5.0); lastEdit = DateTime.Now; + remoteUser.SendLayerData((int)(x / 16), (int)(x / 16), GetHeights1D()); } } break; @@ -224,6 +231,7 @@ namespace OpenSim.Region.Terrain { LowerTerrain(y, x, size, (double) seconds/5.0); lastEdit = DateTime.Now; + remoteUser.SendLayerData((int)(x / 16), (int)(x / 16), GetHeights1D()); } } break; @@ -296,6 +304,8 @@ namespace OpenSim.Region.Terrain return; } + + /// /// Checks to make sure the terrain is within baked values +/- maxRaise/minLower