diff options
author | AliciaRaven | 2014-09-13 04:25:31 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-09-23 00:04:59 +0100 |
commit | 1e220911938ef3d16cee0112b81333a60b3e5d52 (patch) | |
tree | 8f7104983c4760c06b721ce4b0211ec4817b7b6e /OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | |
parent | Add an event callback for loading IAR files. The callback for creating them a... (diff) | |
download | opensim-SC_OLD-1e220911938ef3d16cee0112b81333a60b3e5d52.zip opensim-SC_OLD-1e220911938ef3d16cee0112b81333a60b3e5d52.tar.gz opensim-SC_OLD-1e220911938ef3d16cee0112b81333a60b3e5d52.tar.bz2 opensim-SC_OLD-1e220911938ef3d16cee0112b81333a60b3e5d52.tar.xz |
Modifications to previous IAR commits to bring them more inline with existing OpenSim code conventions. Also include new IAR save switch in console help print out.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs index b85bbea..5b5987d 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | |||
@@ -141,7 +141,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
141 | + "-e|--exclude=<name/uuid> don't save the inventory item in archive" + Environment.NewLine | 141 | + "-e|--exclude=<name/uuid> don't save the inventory item in archive" + Environment.NewLine |
142 | + "-f|--excludefolder=<folder/uuid> don't save contents of the folder in archive" + Environment.NewLine | 142 | + "-f|--excludefolder=<folder/uuid> don't save contents of the folder in archive" + Environment.NewLine |
143 | + "-v|--verbose extra debug messages.\n" | 143 | + "-v|--verbose extra debug messages.\n" |
144 | + "--noassets stops assets being saved to the IAR.", | 144 | + "--noassets stops assets being saved to the IAR." |
145 | + "--perm=<permissions> stops items with insufficient permissions from being saved to the IAR.\n" | ||
146 | + " <permissions> can contain one or more of these characters: \"C\" = Copy, \"T\" = Transfer, \"M\" = Modify.\n", | ||
145 | HandleSaveInvConsoleCommand); | 147 | HandleSaveInvConsoleCommand); |
146 | 148 | ||
147 | m_aScene = scene; | 149 | m_aScene = scene; |
@@ -455,7 +457,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
455 | options["excludefolders"] = new List<String>(); | 457 | options["excludefolders"] = new List<String>(); |
456 | ((List<String>)options["excludefolders"]).Add(v); | 458 | ((List<String>)options["excludefolders"]).Add(v); |
457 | }); | 459 | }); |
458 | ops.Add("perm=", delegate(string v) { options["perm"] = v; }); | 460 | ops.Add("perm=", delegate(string v) { options["checkPermissions"] = v; }); |
459 | 461 | ||
460 | List<string> mainParams = ops.Parse(cmdparams); | 462 | List<string> mainParams = ops.Parse(cmdparams); |
461 | 463 | ||