From 315a49e7fdec9b7612ecf2bd9efd756e9223d6d5 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Mon, 2 Jul 2007 23:52:18 +0000
Subject: You can now substitute %name% in the filename argument for terrain
 save & load commands to input the sims name. Useful for sugilite regions
 where you are running multiple sims in a single instance and need to get them
 to load or save in a pattern. (Needs cleaning & expansion)

---
 OpenSim/Region/Application/OpenSimMain.cs            | 2 +-
 OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 102ff76..097d1cc 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -429,7 +429,7 @@ namespace OpenSim
                     string result = "";
                     for (int i = 0; i < m_localWorld.Count; i++)
                     {
-                        if (!((Scene)m_localWorld[i]).Terrain.RunTerrainCmd(cmdparams, ref result))
+                        if (!((Scene)m_localWorld[i]).Terrain.RunTerrainCmd(cmdparams, ref result,m_localWorld[i].RegionInfo.RegionName))
                         {
                             m_log.Error(result);
                         }
diff --git a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
index 8bd09e3..0f450c3 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
@@ -178,7 +178,7 @@ namespace OpenSim.Region.Terrain
         /// <param name="args">Commandline arguments (space seperated)</param>
         /// <param name="resultText">Reference that returns error or help text if returning false</param>
         /// <returns>If the operation was successful (if not, the error is placed into resultText)</returns>
-        public bool RunTerrainCmd(string[] args, ref string resultText)
+        public bool RunTerrainCmd(string[] args, ref string resultText, string simName)
         {
             string command = args[0];
 
@@ -248,6 +248,7 @@ namespace OpenSim.Region.Terrain
                         break;
 
                     case "load":
+                        args[2].Replace("%name%", simName);
                         switch (args[1].ToLower())
                         {
                             case "f32":
@@ -273,6 +274,7 @@ namespace OpenSim.Region.Terrain
                         break;
 
                     case "save":
+                        args[2].Replace("%name%", simName);
                         switch (args[1].ToLower())
                         {
                             case "f32":
-- 
cgit v1.1