From d62612582552842ae138de7bec66656448c8e568 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Wed, 12 Mar 2008 13:03:44 +0000
Subject: * Fix for Smooth Area Flood Brush, now doesn't flood the entire sim.

---
 OpenSim/Region/Environment/Modules/Terrain/FloodBrushes/SmoothArea.cs | 3 +++
 OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs           | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'OpenSim')

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
             {
                 for (y = 0; y < map.Height; y++)
                 {
+                    if (!fillArea[x, y])
+                        continue;
+
                     double average = 0.0;
                     int avgsteps = 0;
 
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
                         fillArea.Initialize();
 
                         int x, y;
-
+    
                         for (x = 0; x < m_channel.Width; x++)
                         {
                             for (y = 0; y < m_channel.Height; y++)
-- 
cgit v1.1