diff options
author | Teravus Ovares | 2008-01-29 06:16:06 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-01-29 06:16:06 +0000 |
commit | 832243c6e8ccfe817dd2b1e66afd6cb316a7a1fb (patch) | |
tree | 914aa9cd4c89a6bb09214ae111351d97315ced76 | |
parent | Thanks kinoc for your improved IRC Gateway patch as referenced in mantis issu... (diff) | |
download | opensim-SC-832243c6e8ccfe817dd2b1e66afd6cb316a7a1fb.zip opensim-SC-832243c6e8ccfe817dd2b1e66afd6cb316a7a1fb.tar.gz opensim-SC-832243c6e8ccfe817dd2b1e66afd6cb316a7a1fb.tar.bz2 opensim-SC-832243c6e8ccfe817dd2b1e66afd6cb316a7a1fb.tar.xz |
* No more massive spires and massive pits when editing land using Select + tool + amount + apply;
-rw-r--r-- | OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs index 7605122..280ca0d 100644 --- a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs +++ b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs | |||
@@ -165,7 +165,11 @@ namespace OpenSim.Region.Terrain | |||
165 | { | 165 | { |
166 | // Shiny. | 166 | // Shiny. |
167 | double size = (double) (1 << brushsize); | 167 | double size = (double) (1 << brushsize); |
168 | 168 | //System.Console.WriteLine("SIZE:" + size.ToString() + " Seconds:" + seconds.ToString()); | |
169 | if (seconds == 1) | ||
170 | { | ||
171 | seconds = 0.0315f; | ||
172 | } | ||
169 | /* Okay, so here's the deal | 173 | /* Okay, so here's the deal |
170 | * This has to handle both when a user draws on the terrain *and* when a user selects | 174 | * This has to handle both when a user draws on the terrain *and* when a user selects |
171 | * a selection of AABB on terrain and applies whatever routine the client requests | 175 | * a selection of AABB on terrain and applies whatever routine the client requests |
@@ -202,6 +206,8 @@ namespace OpenSim.Region.Terrain | |||
202 | { | 206 | { |
203 | FlattenTerrain(y, x, size, (double) seconds/5.0); | 207 | FlattenTerrain(y, x, size, (double) seconds/5.0); |
204 | lastEdit = DateTime.Now; | 208 | lastEdit = DateTime.Now; |
209 | remoteUser.SendLayerData((int)(x / 16), (int)(x / 16), GetHeights1D()); | ||
210 | |||
205 | } | 211 | } |
206 | } | 212 | } |
207 | break; | 213 | break; |
@@ -213,6 +219,7 @@ namespace OpenSim.Region.Terrain | |||
213 | { | 219 | { |
214 | RaiseTerrain(y, x, size, (double) seconds/5.0); | 220 | RaiseTerrain(y, x, size, (double) seconds/5.0); |
215 | lastEdit = DateTime.Now; | 221 | lastEdit = DateTime.Now; |
222 | remoteUser.SendLayerData((int)(x / 16), (int)(x / 16), GetHeights1D()); | ||
216 | } | 223 | } |
217 | } | 224 | } |
218 | break; | 225 | break; |
@@ -224,6 +231,7 @@ namespace OpenSim.Region.Terrain | |||
224 | { | 231 | { |
225 | LowerTerrain(y, x, size, (double) seconds/5.0); | 232 | LowerTerrain(y, x, size, (double) seconds/5.0); |
226 | lastEdit = DateTime.Now; | 233 | lastEdit = DateTime.Now; |
234 | remoteUser.SendLayerData((int)(x / 16), (int)(x / 16), GetHeights1D()); | ||
227 | } | 235 | } |
228 | } | 236 | } |
229 | break; | 237 | break; |
@@ -296,6 +304,8 @@ namespace OpenSim.Region.Terrain | |||
296 | return; | 304 | return; |
297 | } | 305 | } |
298 | 306 | ||
307 | |||
308 | |||
299 | 309 | ||
300 | /// <summary> | 310 | /// <summary> |
301 | /// Checks to make sure the terrain is within baked values +/- maxRaise/minLower | 311 | /// Checks to make sure the terrain is within baked values +/- maxRaise/minLower |