aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorAdam Frisby2008-03-12 13:03:44 +0000
committerAdam Frisby2008-03-12 13:03:44 +0000
commitd62612582552842ae138de7bec66656448c8e568 (patch)
tree72c6156bb5716803b6d9c75efc15d119f5ec56fc
parent* Fix for SQLiteAssetData - We now ignore duplicate assets. We shouldn't supp... (diff)
downloadopensim-SC_OLD-d62612582552842ae138de7bec66656448c8e568.zip
opensim-SC_OLD-d62612582552842ae138de7bec66656448c8e568.tar.gz
opensim-SC_OLD-d62612582552842ae138de7bec66656448c8e568.tar.bz2
opensim-SC_OLD-d62612582552842ae138de7bec66656448c8e568.tar.xz
* Fix for Smooth Area Flood Brush, now doesn't flood the entire sim.
-rw-r--r--OpenSim/Region/Environment/Modules/Terrain/FloodBrushes/SmoothArea.cs3
-rw-r--r--OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs2
2 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Modules/Terrain/FloodBrushes/SmoothArea.cs b/OpenSim/Region/Environment/Modules/Terrain/FloodBrushes/SmoothArea.cs
index e7d0373..fd25a06 100644
--- a/OpenSim/Region/Environment/Modules/Terrain/FloodBrushes/SmoothArea.cs
+++ b/OpenSim/Region/Environment/Modules/Terrain/FloodBrushes/SmoothArea.cs
@@ -78,6 +78,9 @@ namespace OpenSim.Region.Environment.Modules.Terrain.FloodBrushes
78 { 78 {
79 for (y = 0; y < map.Height; y++) 79 for (y = 0; y < map.Height; y++)
80 { 80 {
81 if (!fillArea[x, y])
82 continue;
83
81 double average = 0.0; 84 double average = 0.0;
82 int avgsteps = 0; 85 int avgsteps = 0;
83 86
diff --git a/OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs b/OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs
index 639257c..83c6658 100644
--- a/OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs
@@ -414,7 +414,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain
414 fillArea.Initialize(); 414 fillArea.Initialize();
415 415
416 int x, y; 416 int x, y;
417 417
418 for (x = 0; x < m_channel.Width; x++) 418 for (x = 0; x < m_channel.Width; x++)
419 { 419 {
420 for (y = 0; y < m_channel.Height; y++) 420 for (y = 0; y < m_channel.Height; y++)