diff options
| author | Justin Clark-Casey (justincc) | 2011-05-27 19:39:03 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-05-27 19:39:03 +0100 |
| commit | 0af5bb239f757eabfc4c59a18b88edfbf7afa6e6 (patch) | |
| tree | 68ff58319af97a566aac796a3828f47468370367 | |
| parent | Avoid a scary warning message about null replies from the user agent service. (diff) | |
| download | opensim-SC-0af5bb239f757eabfc4c59a18b88edfbf7afa6e6.zip opensim-SC-0af5bb239f757eabfc4c59a18b88edfbf7afa6e6.tar.gz opensim-SC-0af5bb239f757eabfc4c59a18b88edfbf7afa6e6.tar.bz2 opensim-SC-0af5bb239f757eabfc4c59a18b88edfbf7afa6e6.tar.xz | |
When saving an iar, don't chase down link asset IDs (since these points to other items rather than real assets)
This bug had no practical effect other than to make "save iar" misreport the number of missing assets
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs index b5272ad..c34a0ec 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | |||
| @@ -157,7 +157,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
| 157 | string serialization = UserInventoryItemSerializer.Serialize(inventoryItem, options, userAccountService); | 157 | string serialization = UserInventoryItemSerializer.Serialize(inventoryItem, options, userAccountService); |
| 158 | m_archiveWriter.WriteFile(filename, serialization); | 158 | m_archiveWriter.WriteFile(filename, serialization); |
| 159 | 159 | ||
| 160 | if (SaveAssets) | 160 | AssetType itemAssetType = (AssetType)inventoryItem.AssetType; |
| 161 | |||
| 162 | // Don't chase down link asset items as they actually point to their target item IDs rather than an asset | ||
| 163 | if (SaveAssets && itemAssetType != AssetType.Link && itemAssetType != AssetType.LinkFolder) | ||
| 161 | m_assetGatherer.GatherAssetUuids(inventoryItem.AssetID, (AssetType)inventoryItem.AssetType, m_assetUuids); | 164 | m_assetGatherer.GatherAssetUuids(inventoryItem.AssetID, (AssetType)inventoryItem.AssetType, m_assetUuids); |
| 162 | } | 165 | } |
| 163 | 166 | ||