diff options
author | Justin Clark-Casey (justincc) | 2011-05-27 21:57:54 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-05-27 21:57:54 +0100 |
commit | 85bad46365ef598aa4947533c094a9145376ed97 (patch) | |
tree | 816802628768e6184405b89c1846f759e0c2204b | |
parent | fix bug where outfit folder links could not be deleted (diff) | |
download | opensim-SC_OLD-85bad46365ef598aa4947533c094a9145376ed97.zip opensim-SC_OLD-85bad46365ef598aa4947533c094a9145376ed97.tar.gz opensim-SC_OLD-85bad46365ef598aa4947533c094a9145376ed97.tar.bz2 opensim-SC_OLD-85bad46365ef598aa4947533c094a9145376ed97.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 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs index c039b5a..317b8e3 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | |||
@@ -150,7 +150,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
150 | string serialization = UserInventoryItemSerializer.Serialize(inventoryItem, options, userAccountService); | 150 | string serialization = UserInventoryItemSerializer.Serialize(inventoryItem, options, userAccountService); |
151 | m_archiveWriter.WriteFile(filename, serialization); | 151 | m_archiveWriter.WriteFile(filename, serialization); |
152 | 152 | ||
153 | m_assetGatherer.GatherAssetUuids(inventoryItem.AssetID, (AssetType)inventoryItem.AssetType, m_assetUuids); | 153 | AssetType itemAssetType = (AssetType)inventoryItem.AssetType; |
154 | |||
155 | // Don't chase down link asset items as they actually point to their target item IDs rather than an asset | ||
156 | if (itemAssetType != AssetType.Link && itemAssetType != AssetType.LinkFolder) | ||
157 | m_assetGatherer.GatherAssetUuids(inventoryItem.AssetID, (AssetType)inventoryItem.AssetType, m_assetUuids); | ||
154 | } | 158 | } |
155 | 159 | ||
156 | /// <summary> | 160 | /// <summary> |