diff options
author | Diva Canto | 2011-01-08 16:17:00 -0800 |
---|---|---|
committer | Diva Canto | 2011-01-08 16:17:00 -0800 |
commit | 35a2961ccd1407153f9040e03f4a49b0e615e29f (patch) | |
tree | 13281bbd0e4c2761410c4d6d5727afa4c8ff05c0 /OpenSim/Region | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-35a2961ccd1407153f9040e03f4a49b0e615e29f.zip opensim-SC-35a2961ccd1407153f9040e03f4a49b0e615e29f.tar.gz opensim-SC-35a2961ccd1407153f9040e03f4a49b0e615e29f.tar.bz2 opensim-SC-35a2961ccd1407153f9040e03f4a49b0e615e29f.tar.xz |
Added a -v|verbose option to save iar.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs index 5e5f6c0..dc4900f 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | |||
@@ -139,6 +139,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
139 | 139 | ||
140 | protected void SaveInvItem(InventoryItemBase inventoryItem, string path, Dictionary<string, object> options, IUserAccountService userAccountService) | 140 | protected void SaveInvItem(InventoryItemBase inventoryItem, string path, Dictionary<string, object> options, IUserAccountService userAccountService) |
141 | { | 141 | { |
142 | if (options.ContainsKey("verbose")) | ||
143 | m_log.InfoFormat("[INVENTORY ARCHIVER]: Saving item {0} with asset {1}", inventoryItem.ID, inventoryItem.AssetID); | ||
144 | |||
142 | string filename = path + CreateArchiveItemName(inventoryItem); | 145 | string filename = path + CreateArchiveItemName(inventoryItem); |
143 | 146 | ||
144 | // Record the creator of this item for user record purposes (which might go away soon) | 147 | // Record the creator of this item for user record purposes (which might go away soon) |
@@ -162,6 +165,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
162 | InventoryFolderBase inventoryFolder, string path, bool saveThisFolderItself, | 165 | InventoryFolderBase inventoryFolder, string path, bool saveThisFolderItself, |
163 | Dictionary<string, object> options, IUserAccountService userAccountService) | 166 | Dictionary<string, object> options, IUserAccountService userAccountService) |
164 | { | 167 | { |
168 | if (options.ContainsKey("verbose")) | ||
169 | m_log.InfoFormat("[INVENTORY ARCHIVER]: Saving folder {0}", inventoryFolder.Name); | ||
170 | |||
165 | if (saveThisFolderItself) | 171 | if (saveThisFolderItself) |
166 | { | 172 | { |
167 | path += CreateArchiveFolderName(inventoryFolder); | 173 | path += CreateArchiveFolderName(inventoryFolder); |
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs index b1c2a3c..1a96098 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | |||
@@ -122,12 +122,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
122 | 122 | ||
123 | scene.AddCommand( | 123 | scene.AddCommand( |
124 | this, "save iar", | 124 | this, "save iar", |
125 | "save iar [--p|-profile=<url>] <first> <last> <inventory path> <password> [<IAR path>]", | 125 | "save iar [--p|-profile=<url>] <first> <last> <inventory path> <password> [<IAR path>] [--v|-verbose]", |
126 | "Save user inventory archive (IAR).", | 126 | "Save user inventory archive (IAR).", |
127 | "<first> is the user's first name." + Environment.NewLine | 127 | "<first> is the user's first name." + Environment.NewLine |
128 | + "<last> is the user's last name." + Environment.NewLine | 128 | + "<last> is the user's last name." + Environment.NewLine |
129 | + "<inventory path> is the path inside the user's inventory for the folder/item to be saved." + Environment.NewLine | 129 | + "<inventory path> is the path inside the user's inventory for the folder/item to be saved." + Environment.NewLine |
130 | + "-p|--profile=<url> adds the url of the profile service to the saved user information." + Environment.NewLine | 130 | + "-p|--profile=<url> adds the url of the profile service to the saved user information." + Environment.NewLine |
131 | + "-v|--verbose extra debug messages." + Environment.NewLine | ||
131 | + "<IAR path> is the filesystem path at which to save the IAR." | 132 | + "<IAR path> is the filesystem path at which to save the IAR." |
132 | + string.Format(" If this is not given then the filename {0} in the current directory is used", DEFAULT_INV_BACKUP_FILENAME), | 133 | + string.Format(" If this is not given then the filename {0} in the current directory is used", DEFAULT_INV_BACKUP_FILENAME), |
133 | HandleSaveInvConsoleCommand); | 134 | HandleSaveInvConsoleCommand); |
@@ -394,6 +395,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
394 | OptionSet ops = new OptionSet(); | 395 | OptionSet ops = new OptionSet(); |
395 | //ops.Add("v|version=", delegate(string v) { options["version"] = v; }); | 396 | //ops.Add("v|version=", delegate(string v) { options["version"] = v; }); |
396 | ops.Add("p|profile=", delegate(string v) { options["profile"] = v; }); | 397 | ops.Add("p|profile=", delegate(string v) { options["profile"] = v; }); |
398 | ops.Add("v|verbose", delegate(string v) { options["verbose"] = v; }); | ||
397 | 399 | ||
398 | List<string> mainParams = ops.Parse(cmdparams); | 400 | List<string> mainParams = ops.Parse(cmdparams); |
399 | 401 | ||