2 files changed, 23 insertions, 3 deletions

diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index f16aca8..5da699b 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -62,10 +62,8 @@ namespace OpenSim
             ArgvConfigSource configSource = new ArgvConfigSource(args);
 
             configSource.AddSwitch("Startup", "inifile");
-            configSource.AddSwitch("Startup", "configfile");
             configSource.AddSwitch("Startup", "gridmode");
             configSource.AddSwitch("Startup", "physics");
-            configSource.AddSwitch("Startup", "config");
             configSource.AddSwitch("Startup", "noverbose");
 
             OpenSimMain sim = new OpenSimMain(configSource);
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 3fc6662..327a3c2 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -340,6 +340,28 @@ namespace OpenSim
                     }
                     break;
 
+                case "save-xml":
+                    if (cmdparams.Length > 0)
+                    {
+                        m_localScenes[0].SavePrimsToXml(cmdparams[0]);
+                    }
+                    else
+                    {
+                        m_localScenes[0].SavePrimsToXml("test.xml");
+                    }
+                    break;
+
+                case "load-xml":
+                    if (cmdparams.Length > 0)
+                    {
+                        m_localScenes[0].LoadPrimsFromXml(cmdparams[0]);
+                    }
+                    else
+                    {
+                        m_localScenes[0].LoadPrimsFromXml("test.xml");
+                    }
+                    break;
+
                 case "terrain":
                     string result = "";
                     foreach (Scene scene in m_localScenes)
@@ -357,7 +379,7 @@ namespace OpenSim
                         if (scene.RegionInfo.RegionName.ToLower() == cmdparams[0].ToLower())
                         {
                             string[] tmpCmdparams = new string[cmdparams.Length - 1];
-                            cmdparams.CopyTo(tmpCmdparams,1);
+                            cmdparams.CopyTo(tmpCmdparams, 1);
 
                             if (!scene.Terrain.RunTerrainCmd(tmpCmdparams, ref result2, scene.RegionInfo.RegionName))
                             {