diff options
| author | Justin Clark-Casey (justincc) | 2010-12-18 00:59:37 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-12-18 00:59:37 +0000 |
| commit | 223264047e22b235386cac3517a0b3c6b7133851 (patch) | |
| tree | 9091950f9476868829fa81ce1fc08d02fde7da99 /OpenSim | |
| parent | minor: add [-p|--profile=<url>] to usage line that pops up if save iar consol... (diff) | |
| download | opensim-SC-223264047e22b235386cac3517a0b3c6b7133851.zip opensim-SC-223264047e22b235386cac3517a0b3c6b7133851.tar.gz opensim-SC-223264047e22b235386cac3517a0b3c6b7133851.tar.bz2 opensim-SC-223264047e22b235386cac3517a0b3c6b7133851.tar.xz | |
uncomment "load iar" help lines which added the --merge option
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs index 79bd39e..b1c2a3c 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | |||
| @@ -109,12 +109,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
| 109 | 109 | ||
| 110 | scene.AddCommand( | 110 | scene.AddCommand( |
| 111 | this, "load iar", | 111 | this, "load iar", |
| 112 | "load iar <first> <last> <inventory path> <password> [<IAR path>]", | 112 | "load iar [--merge] <first> <last> <inventory path> <password> [<IAR path>]", |
| 113 | //"load iar [--merge] <first> <last> <inventory path> <password> [<IAR path>]", | ||
| 114 | "Load user inventory archive (IAR).", | 113 | "Load user inventory archive (IAR).", |
| 115 | //"--merge is an option which merges the loaded IAR with existing inventory folders where possible, rather than always creating new ones" | 114 | "--merge is an option which merges the loaded IAR with existing inventory folders where possible, rather than always creating new ones" |
| 116 | //+ "<first> is user's first name." + Environment.NewLine | 115 | + "<first> is user's first name." + Environment.NewLine |
| 117 | "<first> is user's first name." + Environment.NewLine | ||
| 118 | + "<last> is user's last name." + Environment.NewLine | 116 | + "<last> is user's last name." + Environment.NewLine |
| 119 | + "<inventory path> is the path inside the user's inventory where the IAR should be loaded." + Environment.NewLine | 117 | + "<inventory path> is the path inside the user's inventory where the IAR should be loaded." + Environment.NewLine |
| 120 | + "<password> is the user's password." + Environment.NewLine | 118 | + "<password> is the user's password." + Environment.NewLine |