diff options
| author | Diva Canto | 2012-03-10 08:09:43 -0800 |
|---|---|---|
| committer | Diva Canto | 2012-03-10 08:09:43 -0800 |
| commit | 291dc3969181f4718e84f33e18c4bf9d519cde3d (patch) | |
| tree | c22f305a20f32b0a390681ca73eab8cc0bf213b0 /OpenSim/Region/CoreModules/Avatar | |
| parent | Serialize all web requests to a particular host:port pair; only applied to th... (diff) | |
| parent | Fix TestSaveOarNoAssets() by not launch a no-assets request on a separate thr... (diff) | |
| download | opensim-SC-291dc3969181f4718e84f33e18c4bf9d519cde3d.zip opensim-SC-291dc3969181f4718e84f33e18c4bf9d519cde3d.tar.gz opensim-SC-291dc3969181f4718e84f33e18c4bf9d519cde3d.tar.bz2 opensim-SC-291dc3969181f4718e84f33e18c4bf9d519cde3d.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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( |