diff options
author | Melanie | 2012-03-11 02:29:43 +0000 |
---|---|---|
committer | Melanie | 2012-03-11 02:29:43 +0000 |
commit | f292e19689f9b01a5706e765543064b6ad61caa9 (patch) | |
tree | 0752aaa6a4ddc23c2f3a9296f02143cea3b6e6e1 /OpenSim/Region/CoreModules/Avatar/Inventory/Archiver | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-f292e19689f9b01a5706e765543064b6ad61caa9.zip opensim-SC_OLD-f292e19689f9b01a5706e765543064b6ad61caa9.tar.gz opensim-SC_OLD-f292e19689f9b01a5706e765543064b6ad61caa9.tar.bz2 opensim-SC_OLD-f292e19689f9b01a5706e765543064b6ad61caa9.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Archiver')
-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 c6e9964..8560c73 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | |||
@@ -267,12 +267,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
267 | 267 | ||
268 | m_archiveWriter = new TarArchiveWriter(m_saveStream); | 268 | m_archiveWriter = new TarArchiveWriter(m_saveStream); |
269 | 269 | ||
270 | m_log.InfoFormat("[INVENTORY ARCHIVER]: Adding control file to archive."); | ||
271 | |||
270 | // Write out control file. This has to be done first so that subsequent loaders will see this file first | 272 | // Write out control file. This has to be done first so that subsequent loaders will see this file first |
271 | // XXX: I know this is a weak way of doing it since external non-OAR aware tar executables will not do this | 273 | // XXX: I know this is a weak way of doing it since external non-OAR aware tar executables will not do this |
272 | // not sure how to fix this though, short of going with a completely different file format. | 274 | // not sure how to fix this though, short of going with a completely different file format. |
273 | m_archiveWriter.WriteFile(ArchiveConstants.CONTROL_FILE_PATH, CreateControlFile(options)); | 275 | m_archiveWriter.WriteFile(ArchiveConstants.CONTROL_FILE_PATH, CreateControlFile(options)); |
274 | m_log.InfoFormat("[INVENTORY ARCHIVER]: Added control file to archive."); | 276 | |
275 | |||
276 | if (inventoryFolder != null) | 277 | if (inventoryFolder != null) |
277 | { | 278 | { |
278 | m_log.DebugFormat( | 279 | m_log.DebugFormat( |