aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimBase.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-10-19 17:51:42 +0000
committerJustin Clarke Casey2008-10-19 17:51:42 +0000
commitf7205da1d9e9aacf07c6e8e65f68f03848f2cb04 (patch)
treef60a02578aca207bcd6d95e034fdc790dcef9ac9 /OpenSim/Region/Application/OpenSimBase.cs
parent* Fixed UDP server (again) (diff)
downloadopensim-SC_OLD-f7205da1d9e9aacf07c6e8e65f68f03848f2cb04.zip
opensim-SC_OLD-f7205da1d9e9aacf07c6e8e65f68f03848f2cb04.tar.gz
opensim-SC_OLD-f7205da1d9e9aacf07c6e8e65f68f03848f2cb04.tar.bz2
opensim-SC_OLD-f7205da1d9e9aacf07c6e8e65f68f03848f2cb04.tar.xz
* move command line parsing code from inventory archive modules to opensim server
* use default inventory archive name if none is given * other minor cleanups * this facility is not useable yet
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs24
1 files changed, 20 insertions, 4 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index eff2422..69bb4d8 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -686,7 +686,7 @@ namespace OpenSim
686 #endregion 686 #endregion
687 687
688 /// <summary> 688 /// <summary>
689 /// Save inventory to a file. 689 /// Save inventory to a file archive
690 /// </summary> 690 /// </summary>
691 /// <param name="cmdparams"></param> 691 /// <param name="cmdparams"></param>
692 protected void SaveInv(string[] cmdparams) 692 protected void SaveInv(string[] cmdparams)
@@ -697,11 +697,19 @@ namespace OpenSim
697 m_log.Error("[CONSOLE]: usage is save-inv <first name> <last name> <inventory path> [<save file path>]"); 697 m_log.Error("[CONSOLE]: usage is save-inv <first name> <last name> <inventory path> [<save file path>]");
698 return; 698 return;
699 } 699 }
700 new InventoryArchiveWriteRequest(m_sceneManager.CurrentOrFirstScene,m_commsManager).execute(cmdparams); 700
701 string firstName = cmdparams[0];
702 string lastName = cmdparams[1];
703 string invPath = cmdparams[2];
704 string savePath = (cmdparams.Length > 3 ? cmdparams[3] : DEFAULT_INV_BACKUP_FILENAME);
705
706 new InventoryArchiveWriteRequest(
707 m_sceneManager.CurrentOrFirstScene,m_commsManager).execute(
708 firstName, lastName, invPath, savePath);
701 } 709 }
702 710
703 /// <summary> 711 /// <summary>
704 /// Load inventory from a tar.gz file. 712 /// Load inventory from an inventory file archive
705 /// </summary> 713 /// </summary>
706 /// <param name="cmdparams"></param> 714 /// <param name="cmdparams"></param>
707 protected void LoadInv(string[] cmdparams) 715 protected void LoadInv(string[] cmdparams)
@@ -712,7 +720,15 @@ namespace OpenSim
712 m_log.Error("[CONSOLE]: usage is load-inv <first name> <last name> <inventory path> [<load file path>]"); 720 m_log.Error("[CONSOLE]: usage is load-inv <first name> <last name> <inventory path> [<load file path>]");
713 return; 721 return;
714 } 722 }
715 new InventoryArchiveReadRequest(m_sceneManager.CurrentOrFirstScene, m_commsManager).execute(cmdparams); 723
724 string firstName = cmdparams[0];
725 string lastName = cmdparams[1];
726 string invPath = cmdparams[2];
727 string loadPath = (cmdparams.Length > 3 ? cmdparams[3] : DEFAULT_INV_BACKUP_FILENAME);
728
729 new InventoryArchiveReadRequest(
730 m_sceneManager.CurrentOrFirstScene, m_commsManager).execute(
731 firstName, lastName, invPath, loadPath);
716 } 732 }
717 733
718 /// <summary> 734 /// <summary>