diff options
| author | Diva Canto | 2011-05-27 13:07:39 -0700 |
|---|---|---|
| committer | Diva Canto | 2011-05-27 13:07:39 -0700 |
| commit | fcef4688a8d846db1c188770e0749dd868f64ca4 (patch) | |
| tree | e3958e48738468f7fb48d9b37c85f557f081d8a3 /OpenSim/Region/CoreModules | |
| parent | HG lures working! Friends can offer friends HG teleports via the profile. WAR... (diff) | |
| parent | If parsing fails in the primitive base shape (which prints out a debug log me... (diff) | |
| download | opensim-SC-fcef4688a8d846db1c188770e0749dd868f64ca4.zip opensim-SC-fcef4688a8d846db1c188770e0749dd868f64ca4.tar.gz opensim-SC-fcef4688a8d846db1c188770e0749dd868f64ca4.tar.bz2 opensim-SC-fcef4688a8d846db1c188770e0749dd868f64ca4.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -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 | ||