diff options
author | John Hurliman | 2010-03-15 14:17:17 -0700 |
---|---|---|
committer | John Hurliman | 2010-03-15 14:17:17 -0700 |
commit | 33f5d0d1e90c3e63e06a200043a01c32768335c1 (patch) | |
tree | 8be352ceace25400a51c3a26ca1c2ce654788e55 /OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-33f5d0d1e90c3e63e06a200043a01c32768335c1.zip opensim-SC_OLD-33f5d0d1e90c3e63e06a200043a01c32768335c1.tar.gz opensim-SC_OLD-33f5d0d1e90c3e63e06a200043a01c32768335c1.tar.bz2 opensim-SC_OLD-33f5d0d1e90c3e63e06a200043a01c32768335c1.tar.xz |
* UuidGatherer now tracks asset types for assets it discovers. The asset types are inferred from context
* OAR saving will attempt to correct unknown asset types before writing broken assets to the OAR file
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs index ef10104..cfe3caa 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | |||
@@ -73,7 +73,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
73 | /// <value> | 73 | /// <value> |
74 | /// Used to collect the uuids of the assets that we need to save into the archive | 74 | /// Used to collect the uuids of the assets that we need to save into the archive |
75 | /// </value> | 75 | /// </value> |
76 | protected Dictionary<UUID, int> m_assetUuids = new Dictionary<UUID, int>(); | 76 | protected Dictionary<UUID, AssetType> m_assetUuids = new Dictionary<UUID, AssetType>(); |
77 | 77 | ||
78 | /// <value> | 78 | /// <value> |
79 | /// Used to collect the uuids of the users that we need to save into the archive | 79 | /// Used to collect the uuids of the users that we need to save into the archive |
@@ -305,7 +305,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
305 | } | 305 | } |
306 | 306 | ||
307 | new AssetsRequest( | 307 | new AssetsRequest( |
308 | new AssetsArchiver(m_archiveWriter), m_assetUuids.Keys, | 308 | new AssetsArchiver(m_archiveWriter), m_assetUuids, |
309 | m_scene.AssetService, ReceivedAllAssets).Execute(); | 309 | m_scene.AssetService, ReceivedAllAssets).Execute(); |
310 | } | 310 | } |
311 | 311 | ||