aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorAdam Frisby2007-08-17 22:44:34 +0000
committerAdam Frisby2007-08-17 22:44:34 +0000
commitd2e48c8014650f1fa025b9cd674d55becb54b18c (patch)
treed27c294aea6b7e639e9388832bfefee5424f4c6d /OpenSim/Region
parentPimped up Default.lsl. Now featuring a touch counter. (diff)
downloadopensim-SC_OLD-d2e48c8014650f1fa025b9cd674d55becb54b18c.zip
opensim-SC_OLD-d2e48c8014650f1fa025b9cd674d55becb54b18c.tar.gz
opensim-SC_OLD-d2e48c8014650f1fa025b9cd674d55becb54b18c.tar.bz2
opensim-SC_OLD-d2e48c8014650f1fa025b9cd674d55becb54b18c.tar.xz
* 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.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs16
-rw-r--r--OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs5
2 files changed, 20 insertions, 1 deletions
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
350 } 350 }
351 } 351 }
352 break; 352 break;
353 case "terrain-sim":
354 string result2 = "";
355 foreach (Scene scene in m_localScenes)
356 {
357 if (scene.RegionInfo.RegionName.ToLower() == cmdparams[0].ToLower())
358 {
359 string[] tmpCmdparams = new string[cmdparams.Length - 1];
360 cmdparams.CopyTo(tmpCmdparams,1);
361
362 if (!scene.Terrain.RunTerrainCmd(tmpCmdparams, ref result2, scene.RegionInfo.RegionName))
363 {
364 m_log.Error(result2);
365 }
366 }
367 }
368 break;
353 case "script": 369 case "script":
354 foreach (Scene scene in m_localScenes) 370 foreach (Scene scene in m_localScenes)
355 { 371 {
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
426 break; 426 break;
427 427
428 case "grdmap": 428 case "grdmap":
429 ExportImage(filename, args[3]); 429 if (args.Length >= 4)
430 ExportImage(filename, args[3]);
431 else
432 ExportImage(filename, "defaultstripe.png");
430 break; 433 break;
431 434
432 case "png": 435 case "png":