diff options
author | Justin Clark-Casey (justincc) | 2015-01-08 20:21:40 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2015-01-08 20:21:40 +0000 |
commit | 08606ae409b400b6f9b83006ed04826eede8a9c7 (patch) | |
tree | b11e1ebfa99dfda28aa3df22041c6e3d167491ce /OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | |
parent | Commented out clear_registry_ because (1) it isn't clearing up anything anymo... (diff) | |
download | opensim-SC_OLD-08606ae409b400b6f9b83006ed04826eede8a9c7.zip opensim-SC_OLD-08606ae409b400b6f9b83006ed04826eede8a9c7.tar.gz opensim-SC_OLD-08606ae409b400b6f9b83006ed04826eede8a9c7.tar.bz2 opensim-SC_OLD-08606ae409b400b6f9b83006ed04826eede8a9c7.tar.xz |
Make the IteratingUuidGatherer the only UuidGatherer.
This UUID gatherer provides a superset of the previous gatherer's functionality
as it also allows the caller to control gathering iterations for load purposes.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs index 6dab227..42a4c7a 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | |||
@@ -94,11 +94,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
94 | protected UUID m_id; | 94 | protected UUID m_id; |
95 | 95 | ||
96 | /// <value> | 96 | /// <value> |
97 | /// Used to collect the uuids of the assets that we need to save into the archive | ||
98 | /// </value> | ||
99 | protected Dictionary<UUID, sbyte> m_assetUuids = new Dictionary<UUID, sbyte>(); | ||
100 | |||
101 | /// <value> | ||
102 | /// Used to collect the uuids of the users that we need to save into the archive | 97 | /// Used to collect the uuids of the users that we need to save into the archive |
103 | /// </value> | 98 | /// </value> |
104 | protected Dictionary<UUID, int> m_userUuids = new Dictionary<UUID, int>(); | 99 | protected Dictionary<UUID, int> m_userUuids = new Dictionary<UUID, int>(); |
@@ -225,7 +220,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
225 | 220 | ||
226 | // Don't chase down link asset items as they actually point to their target item IDs rather than an asset | 221 | // Don't chase down link asset items as they actually point to their target item IDs rather than an asset |
227 | if (SaveAssets && itemAssetType != AssetType.Link && itemAssetType != AssetType.LinkFolder) | 222 | if (SaveAssets && itemAssetType != AssetType.Link && itemAssetType != AssetType.LinkFolder) |
228 | m_assetGatherer.GatherAssetUuids(inventoryItem.AssetID, (sbyte)inventoryItem.AssetType, m_assetUuids); | 223 | m_assetGatherer.AddForInspection(inventoryItem.AssetID); |
229 | } | 224 | } |
230 | 225 | ||
231 | /// <summary> | 226 | /// <summary> |
@@ -422,12 +417,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
422 | 417 | ||
423 | if (SaveAssets) | 418 | if (SaveAssets) |
424 | { | 419 | { |
425 | m_log.DebugFormat("[INVENTORY ARCHIVER]: Saving {0} assets for items", m_assetUuids.Count); | 420 | m_assetGatherer.GatherAll(); |
421 | |||
422 | m_log.DebugFormat( | ||
423 | "[INVENTORY ARCHIVER]: Saving {0} assets for items", m_assetGatherer.GatheredUuids.Count); | ||
426 | 424 | ||
427 | AssetsRequest ar | 425 | AssetsRequest ar |
428 | = new AssetsRequest( | 426 | = new AssetsRequest( |
429 | new AssetsArchiver(m_archiveWriter), | 427 | new AssetsArchiver(m_archiveWriter), |
430 | m_assetUuids, m_scene.AssetService, | 428 | m_assetGatherer.GatheredUuids, m_scene.AssetService, |
431 | m_scene.UserAccountService, m_scene.RegionInfo.ScopeID, | 429 | m_scene.UserAccountService, m_scene.RegionInfo.ScopeID, |
432 | options, ReceivedAllAssets); | 430 | options, ReceivedAllAssets); |
433 | 431 | ||