diff options
author | onefang | 2021-07-07 13:56:29 +1000 |
---|---|---|
committer | onefang | 2021-07-07 13:56:29 +1000 |
commit | 47e6d714b9924d2d8845d501b246a2423feba368 (patch) | |
tree | f7f49e63ac20ffa0fb7b24cabd25383227b05e22 /OpenSim | |
parent | Don't even try to save the IAR for the default GRID SERVICES pretend user. (diff) | |
download | opensim-SC-47e6d714b9924d2d8845d501b246a2423feba368.zip opensim-SC-47e6d714b9924d2d8845d501b246a2423feba368.tar.gz opensim-SC-47e6d714b9924d2d8845d501b246a2423feba368.tar.bz2 opensim-SC-47e6d714b9924d2d8845d501b246a2423feba368.tar.xz |
If no file given for IARs, use users name and put it in the usual backups directory.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs index c74dc32..28a442d 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | |||
@@ -61,7 +61,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
61 | /// <summary> | 61 | /// <summary> |
62 | /// The file to load and save inventory if no filename has been specified | 62 | /// The file to load and save inventory if no filename has been specified |
63 | /// </summary> | 63 | /// </summary> |
64 | protected const string DEFAULT_INV_BACKUP_FILENAME = "user-inventory.iar"; | 64 | protected const string DEFAULT_INV_BACKUP_FILENAME = "../../backups/"; |
65 | 65 | ||
66 | /// <value> | 66 | /// <value> |
67 | /// Pending save and load completions initiated from the console | 67 | /// Pending save and load completions initiated from the console |
@@ -123,7 +123,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
123 | + "<inventory path> is the path inside the user's inventory where the IAR should be loaded." + Environment.NewLine | 123 | + "<inventory path> is the path inside the user's inventory where the IAR should be loaded." + Environment.NewLine |
124 | + "<password> is the user's password." + Environment.NewLine | 124 | + "<password> is the user's password." + Environment.NewLine |
125 | + "<IAR path> is the filesystem path or URI from which to load the IAR." | 125 | + "<IAR path> is the filesystem path or URI from which to load the IAR." |
126 | + string.Format(" If this is not given then the filename {0} in the current directory is used", DEFAULT_INV_BACKUP_FILENAME), | 126 | + string.Format(" If this is not given then the filename based on the users name in the {0} directory is used", DEFAULT_INV_BACKUP_FILENAME), |
127 | HandleLoadInvConsoleCommand); | 127 | HandleLoadInvConsoleCommand); |
128 | 128 | ||
129 | scene.AddCommand( | 129 | scene.AddCommand( |
@@ -134,7 +134,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
134 | + "<last> is the user's last name.\n" | 134 | + "<last> is the user's last name.\n" |
135 | + "<inventory path> is the path inside the user's inventory for the folder/item to be saved.\n" | 135 | + "<inventory path> is the path inside the user's inventory for the folder/item to be saved.\n" |
136 | + "<IAR path> is the filesystem path at which to save the IAR." | 136 | + "<IAR path> is the filesystem path at which to save the IAR." |
137 | + string.Format(" If this is not given then the filename {0} in the current directory is used.\n", DEFAULT_INV_BACKUP_FILENAME) | 137 | + string.Format(" If this is not given then the the filename based on the users name in the {0} directory is used.\n", DEFAULT_INV_BACKUP_FILENAME) |
138 | + "-h|--home=<url> adds the url of the profile service to the saved user information.\n" | 138 | + "-h|--home=<url> adds the url of the profile service to the saved user information.\n" |
139 | + "-c|--creators preserves information about foreign creators.\n" | 139 | + "-c|--creators preserves information about foreign creators.\n" |
140 | + "-e|--exclude=<name/uuid> don't save the inventory item in archive" + Environment.NewLine | 140 | + "-e|--exclude=<name/uuid> don't save the inventory item in archive" + Environment.NewLine |
@@ -420,7 +420,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
420 | string lastName = mainParams[3]; | 420 | string lastName = mainParams[3]; |
421 | string invPath = mainParams[4]; | 421 | string invPath = mainParams[4]; |
422 | string pass = mainParams[5]; | 422 | string pass = mainParams[5]; |
423 | string loadPath = (mainParams.Count > 6 ? mainParams[6] : DEFAULT_INV_BACKUP_FILENAME); | 423 | string loadPath = (mainParams.Count > 6 ? mainParams[6] : DEFAULT_INV_BACKUP_FILENAME + firstName + "_" + lastName + ".IAR"); |
424 | 424 | ||
425 | m_log.InfoFormat( | 425 | m_log.InfoFormat( |
426 | "[INVENTORY ARCHIVER]: Loading archive {0} to inventory path {1} for {2} {3}", | 426 | "[INVENTORY ARCHIVER]: Loading archive {0} to inventory path {1} for {2} {3}", |
@@ -485,7 +485,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
485 | string lastName = mainParams[3]; | 485 | string lastName = mainParams[3]; |
486 | string invPath = mainParams[4]; | 486 | string invPath = mainParams[4]; |
487 | string pass = mainParams[5]; | 487 | string pass = mainParams[5]; |
488 | string savePath = (mainParams.Count > 6 ? mainParams[6] : DEFAULT_INV_BACKUP_FILENAME); | 488 | string savePath = (mainParams.Count > 6 ? mainParams[6] : DEFAULT_INV_BACKUP_FILENAME + firstName + "_" + lastName + ".IAR"); |
489 | 489 | ||
490 | m_log.InfoFormat( | 490 | m_log.InfoFormat( |
491 | "[INVENTORY ARCHIVER]: Saving archive {0} using inventory path {1} for {2} {3}", | 491 | "[INVENTORY ARCHIVER]: Saving archive {0} using inventory path {1} for {2} {3}", |