* Small optimisation on Weathering paint brush.

* Added "script terrain newbrushes <true|false>" to enable experimental terraforming brushes. Presently the 'revert' brush is replaced with the Weathering brush, when enabled.

2 files changed, 14 insertions, 4 deletions

diff --git a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/WeatherSphere.cs b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/WeatherSphere.cs
index 17207f8..bede47e 100644
--- a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/WeatherSphere.cs
+++ b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/WeatherSphere.cs
@@ -211,13 +211,13 @@ namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes
                                 coords[1] += y;

 

                                 if (coords[0] > map.Width - 1)

-                                    coords[0] = map.Width - 1;

+                                    continue;

                                 if (coords[1] > map.Height - 1)

-                                    coords[1] = map.Height - 1;

+                                    continue;

                                 if (coords[0] < 0)

-                                    coords[0] = 0;

+                                    continue;

                                 if (coords[1] < 0)

-                                    coords[1] = 0;

+                                    continue;

 

                                 double heightF = map[x, y];

                                 double target = map[coords[0], coords[1]];

diff --git a/OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs b/OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs
index 6f9adc9..ca07443 100644
--- a/OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs
@@ -332,6 +332,16 @@ namespace OpenSim.Region.Environment.Modules.Terrain
                                 m_channel[x, y] = Double.Parse(param);
                         SendUpdatedLayerData();
                         break;
+                    case "newbrushes":
+                        if (Boolean.Parse(param))
+                        {
+                            m_painteffects[StandardTerrainEffects.Revert] = new PaintBrushes.WeatherSphere();
+                        }
+                        else
+                        {
+                            InstallDefaultEffects();
+                        }
+                        break;
                     default:
                         m_log.Warn("Unknown terrain command.");
                         break;