diff options
| author | Robert Adams | 2014-01-21 11:31:51 -0800 |
|---|---|---|
| committer | Robert Adams | 2014-01-21 11:31:51 -0800 |
| commit | 4c362a83f9ce0b168ea96ba7dbd7ec012445ecff (patch) | |
| tree | 7f03a860379fb2c6905d78a6616db762c86dd634 /OpenSim/Region/CoreModules/Avatar | |
| parent | varregion: remove debugging splat file saving that fills up the (diff) | |
| parent | Adds a configuration option to cannibalize bandwidth from the (diff) | |
| download | opensim-SC_OLD-4c362a83f9ce0b168ea96ba7dbd7ec012445ecff.zip opensim-SC_OLD-4c362a83f9ce0b168ea96ba7dbd7ec012445ecff.tar.gz opensim-SC_OLD-4c362a83f9ce0b168ea96ba7dbd7ec012445ecff.tar.bz2 opensim-SC_OLD-4c362a83f9ce0b168ea96ba7dbd7ec012445ecff.tar.xz | |
Merge branch 'master' into varregion
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
| -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 4ec8ae7..4292719 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | |||
| @@ -78,7 +78,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
| 78 | /// <value> | 78 | /// <value> |
| 79 | /// Used to collect the uuids of the assets that we need to save into the archive | 79 | /// Used to collect the uuids of the assets that we need to save into the archive |
| 80 | /// </value> | 80 | /// </value> |
| 81 | protected Dictionary<UUID, AssetType> m_assetUuids = new Dictionary<UUID, AssetType>(); | 81 | protected Dictionary<UUID, sbyte> m_assetUuids = new Dictionary<UUID, sbyte>(); |
| 82 | 82 | ||
| 83 | /// <value> | 83 | /// <value> |
| 84 | /// Used to collect the uuids of the users that we need to save into the archive | 84 | /// Used to collect the uuids of the users that we need to save into the archive |
| @@ -187,7 +187,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
| 187 | 187 | ||
| 188 | // Don't chase down link asset items as they actually point to their target item IDs rather than an asset | 188 | // Don't chase down link asset items as they actually point to their target item IDs rather than an asset |
| 189 | if (SaveAssets && itemAssetType != AssetType.Link && itemAssetType != AssetType.LinkFolder) | 189 | if (SaveAssets && itemAssetType != AssetType.Link && itemAssetType != AssetType.LinkFolder) |
| 190 | m_assetGatherer.GatherAssetUuids(inventoryItem.AssetID, (AssetType)inventoryItem.AssetType, m_assetUuids); | 190 | m_assetGatherer.GatherAssetUuids(inventoryItem.AssetID, (sbyte)inventoryItem.AssetType, m_assetUuids); |
| 191 | } | 191 | } |
| 192 | 192 | ||
| 193 | /// <summary> | 193 | /// <summary> |