diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Archiver')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs index 26edba4..576a154 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | |||
@@ -109,9 +109,9 @@ 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 [--merge] <first> <last> <inventory path> <password> [<IAR path>]", | 112 | "load iar [-m|--merge] <first> <last> <inventory path> <password> [<IAR path>]", |
113 | "Load user inventory archive (IAR).", | 113 | "Load user inventory archive (IAR).", |
114 | "--merge is an option which merges the loaded IAR with existing inventory folders where possible, rather than always creating new ones" | 114 | "-m|--merge is an option which merges the loaded IAR with existing inventory folders where possible, rather than always creating new ones" |
115 | + "<first> is user's first name." + Environment.NewLine | 115 | + "<first> is user's first name." + Environment.NewLine |
116 | + "<last> is user's last name." + Environment.NewLine | 116 | + "<last> is user's last name." + Environment.NewLine |
117 | + "<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 |
@@ -181,7 +181,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
181 | catch (EntryPointNotFoundException e) | 181 | catch (EntryPointNotFoundException e) |
182 | { | 182 | { |
183 | m_log.ErrorFormat( | 183 | m_log.ErrorFormat( |
184 | "[ARCHIVER]: Mismatch between Mono and zlib1g library version when trying to create compression stream." | 184 | "[INVENTORY ARCHIVER]: Mismatch between Mono and zlib1g library version when trying to create compression stream." |
185 | + "If you've manually installed Mono, have you appropriately updated zlib1g as well?"); | 185 | + "If you've manually installed Mono, have you appropriately updated zlib1g as well?"); |
186 | m_log.Error(e); | 186 | m_log.Error(e); |
187 | 187 | ||
@@ -221,7 +221,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
221 | catch (EntryPointNotFoundException e) | 221 | catch (EntryPointNotFoundException e) |
222 | { | 222 | { |
223 | m_log.ErrorFormat( | 223 | m_log.ErrorFormat( |
224 | "[ARCHIVER]: Mismatch between Mono and zlib1g library version when trying to create compression stream." | 224 | "[INVENTORY ARCHIVER]: Mismatch between Mono and zlib1g library version when trying to create compression stream." |
225 | + "If you've manually installed Mono, have you appropriately updated zlib1g as well?"); | 225 | + "If you've manually installed Mono, have you appropriately updated zlib1g as well?"); |
226 | m_log.Error(e); | 226 | m_log.Error(e); |
227 | 227 | ||
@@ -269,7 +269,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
269 | catch (EntryPointNotFoundException e) | 269 | catch (EntryPointNotFoundException e) |
270 | { | 270 | { |
271 | m_log.ErrorFormat( | 271 | m_log.ErrorFormat( |
272 | "[ARCHIVER]: Mismatch between Mono and zlib1g library version when trying to create compression stream." | 272 | "[INVENTORY ARCHIVER]: Mismatch between Mono and zlib1g library version when trying to create compression stream." |
273 | + "If you've manually installed Mono, have you appropriately updated zlib1g as well?"); | 273 | + "If you've manually installed Mono, have you appropriately updated zlib1g as well?"); |
274 | m_log.Error(e); | 274 | m_log.Error(e); |
275 | 275 | ||
@@ -317,7 +317,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
317 | catch (EntryPointNotFoundException e) | 317 | catch (EntryPointNotFoundException e) |
318 | { | 318 | { |
319 | m_log.ErrorFormat( | 319 | m_log.ErrorFormat( |
320 | "[ARCHIVER]: Mismatch between Mono and zlib1g library version when trying to create compression stream." | 320 | "[INVENTORY ARCHIVER]: Mismatch between Mono and zlib1g library version when trying to create compression stream." |
321 | + "If you've manually installed Mono, have you appropriately updated zlib1g as well?"); | 321 | + "If you've manually installed Mono, have you appropriately updated zlib1g as well?"); |
322 | m_log.Error(e); | 322 | m_log.Error(e); |
323 | 323 | ||
@@ -358,7 +358,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
358 | if (mainParams.Count < 6) | 358 | if (mainParams.Count < 6) |
359 | { | 359 | { |
360 | m_log.Error( | 360 | m_log.Error( |
361 | "[INVENTORY ARCHIVER]: usage is load iar [--merge] <first name> <last name> <inventory path> <user password> [<load file path>]"); | 361 | "[INVENTORY ARCHIVER]: usage is load iar [-m|--merge] <first name> <last name> <inventory path> <user password> [<load file path>]"); |
362 | return; | 362 | return; |
363 | } | 363 | } |
364 | 364 | ||