diff options
| author | Justin Clark-Casey (justincc) | 2012-03-10 02:13:17 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-03-10 02:13:17 +0000 |
| commit | 6e26f17923a912c87052198ac2c220751b954a18 (patch) | |
| tree | 764fa4fecab993df29bf9193099dc8ad890720bf /OpenSim/Region/CoreModules/Avatar | |
| parent | minor: rearrange some save oar messages so they say what they're about to do ... (diff) | |
| download | opensim-SC_OLD-6e26f17923a912c87052198ac2c220751b954a18.zip opensim-SC_OLD-6e26f17923a912c87052198ac2c220751b954a18.tar.gz opensim-SC_OLD-6e26f17923a912c87052198ac2c220751b954a18.tar.bz2 opensim-SC_OLD-6e26f17923a912c87052198ac2c220751b954a18.tar.xz | |
minor: In IAR save, log when we start adding the control file rather than saying afterwards that we added it.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs index 5238325..a26c73a 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | |||
| @@ -270,12 +270,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
| 270 | 270 | ||
| 271 | m_archiveWriter = new TarArchiveWriter(m_saveStream); | 271 | m_archiveWriter = new TarArchiveWriter(m_saveStream); |
| 272 | 272 | ||
| 273 | m_log.InfoFormat("[INVENTORY ARCHIVER]: Adding control file to archive."); | ||
| 274 | |||
| 273 | // Write out control file. This has to be done first so that subsequent loaders will see this file first | 275 | // Write out control file. This has to be done first so that subsequent loaders will see this file first |
| 274 | // XXX: I know this is a weak way of doing it since external non-OAR aware tar executables will not do this | 276 | // XXX: I know this is a weak way of doing it since external non-OAR aware tar executables will not do this |
| 275 | // not sure how to fix this though, short of going with a completely different file format. | 277 | // not sure how to fix this though, short of going with a completely different file format. |
| 276 | m_archiveWriter.WriteFile(ArchiveConstants.CONTROL_FILE_PATH, CreateControlFile(options)); | 278 | m_archiveWriter.WriteFile(ArchiveConstants.CONTROL_FILE_PATH, CreateControlFile(options)); |
| 277 | m_log.InfoFormat("[INVENTORY ARCHIVER]: Added control file to archive."); | 279 | |
| 278 | |||
| 279 | if (inventoryFolder != null) | 280 | if (inventoryFolder != null) |
| 280 | { | 281 | { |
| 281 | m_log.DebugFormat( | 282 | m_log.DebugFormat( |