From 88ead9ee63fe87b16d7c24b3a38bf6567f3166f6 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 24 Nov 2009 17:28:38 +0000
Subject: pass all command parameters to load/save oar, not just the filename
unfortunately, these commands cannot yet be properly relocated to the region
modules due to deficiencies in the region module infrastructure
---
OpenSim/Region/Application/OpenSim.cs | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
(limited to 'OpenSim/Region/Application/OpenSim.cs')
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 60c34df..f9be1e2 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -1294,14 +1294,7 @@ namespace OpenSim
{
try
{
- if (cmdparams.Length > 2)
- {
- m_sceneManager.LoadArchiveToCurrentScene(cmdparams[2]);
- }
- else
- {
- m_sceneManager.LoadArchiveToCurrentScene(DEFAULT_OAR_BACKUP_FILENAME);
- }
+ m_sceneManager.LoadArchiveToCurrentScene(cmdparams);
}
catch (Exception e)
{
@@ -1315,14 +1308,7 @@ namespace OpenSim
/// <param name="cmdparams"></param>
protected void SaveOar(string module, string[] cmdparams)
{
- if (cmdparams.Length > 2)
- {
- m_sceneManager.SaveCurrentSceneToArchive(cmdparams[2]);
- }
- else
- {
- m_sceneManager.SaveCurrentSceneToArchive(DEFAULT_OAR_BACKUP_FILENAME);
- }
+ m_sceneManager.SaveCurrentSceneToArchive(cmdparams);
}
private static string CombineParams(string[] commandParams, int pos)
--
cgit v1.1
From a4d2a97bc6ead3aeba4e1be419d976925e5ee470 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 25 Nov 2009 16:14:08 +0000
Subject: minor: remove some mono compiler warnings, add --merge load oar
switch to help information
---
OpenSim/Region/Application/OpenSim.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Region/Application/OpenSim.cs')
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index f9be1e2..5228e4b 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -232,7 +232,7 @@ namespace OpenSim
"Save named prim to XML2", SavePrimsXml2);
m_console.Commands.AddCommand("region", false, "load oar",
- "load oar <oar name>",
+ "load oar [--merge] <oar name>",
"Load a region's data from OAR archive", LoadOar);
m_console.Commands.AddCommand("region", false, "save oar",
--
cgit v1.1