From d2e48c8014650f1fa025b9cd674d55becb54b18c Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Fri, 17 Aug 2007 22:44:34 +0000
Subject: * Added new terrain-sim <simname> <terrain commands...> function to
 run terrain commands on a specific sim. * Made arguments for terrain save
 grdmap optional. Uses defaultstripe if no argument specified.

---
 OpenSim/Region/Application/OpenSimMain.cs            | 16 ++++++++++++++++
 OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs |  5 ++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 7249c5d..3fc6662 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -350,6 +350,22 @@ namespace OpenSim
                         }
                     }
                     break;
+                case "terrain-sim":
+                    string result2 = "";
+                    foreach (Scene scene in m_localScenes)
+                    {
+                        if (scene.RegionInfo.RegionName.ToLower() == cmdparams[0].ToLower())
+                        {
+                            string[] tmpCmdparams = new string[cmdparams.Length - 1];
+                            cmdparams.CopyTo(tmpCmdparams,1);
+
+                            if (!scene.Terrain.RunTerrainCmd(tmpCmdparams, ref result2, scene.RegionInfo.RegionName))
+                            {
+                                m_log.Error(result2);
+                            }
+                        }
+                    }
+                    break;
                 case "script":
                     foreach (Scene scene in m_localScenes)
                     {
diff --git a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
index 4976e5d..f54fd67 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
@@ -426,7 +426,10 @@ namespace OpenSim.Region.Terrain
                                 break;
 
                             case "grdmap":
-                                ExportImage(filename, args[3]);
+                                if (args.Length >= 4)
+                                    ExportImage(filename, args[3]);
+                                else
+                                    ExportImage(filename, "defaultstripe.png");
                                 break;
 
                             case "png":
-- 
cgit v1.1