diff options
| author | Melanie | 2010-03-18 20:09:04 +0000 |
|---|---|---|
| committer | Melanie | 2010-03-18 20:09:04 +0000 |
| commit | 4c2a51b1b5e2169e0f336c56a023c35bcc334cbd (patch) | |
| tree | 9fbaf708764f315034a283fd8fedc8afe0864d75 /OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs | |
| parent | Merge branch 'careminster' into careminster-presence-refactor (diff) | |
| parent | Flesh out the new permission method (diff) | |
| download | opensim-SC-4c2a51b1b5e2169e0f336c56a023c35bcc334cbd.zip opensim-SC-4c2a51b1b5e2169e0f336c56a023c35bcc334cbd.tar.gz opensim-SC-4c2a51b1b5e2169e0f336c56a023c35bcc334cbd.tar.bz2 opensim-SC-4c2a51b1b5e2169e0f336c56a023c35bcc334cbd.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs b/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs index 6686264..8b80ebe 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs | |||
| @@ -61,7 +61,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
| 61 | AssetBase corruptAsset = AssetHelpers.CreateAsset(corruptAssetUuid, "CORRUPT ASSET", UUID.Zero); | 61 | AssetBase corruptAsset = AssetHelpers.CreateAsset(corruptAssetUuid, "CORRUPT ASSET", UUID.Zero); |
| 62 | m_assetService.Store(corruptAsset); | 62 | m_assetService.Store(corruptAsset); |
| 63 | 63 | ||
| 64 | IDictionary<UUID, int> foundAssetUuids = new Dictionary<UUID, int>(); | 64 | IDictionary<UUID, AssetType> foundAssetUuids = new Dictionary<UUID, AssetType>(); |
| 65 | m_uuidGatherer.GatherAssetUuids(corruptAssetUuid, AssetType.Object, foundAssetUuids); | 65 | m_uuidGatherer.GatherAssetUuids(corruptAssetUuid, AssetType.Object, foundAssetUuids); |
| 66 | 66 | ||
| 67 | // We count the uuid as gathered even if the asset itself is corrupt. | 67 | // We count the uuid as gathered even if the asset itself is corrupt. |
| @@ -77,7 +77,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
| 77 | TestHelper.InMethod(); | 77 | TestHelper.InMethod(); |
| 78 | 78 | ||
| 79 | UUID missingAssetUuid = UUID.Parse("00000000-0000-0000-0000-000000000666"); | 79 | UUID missingAssetUuid = UUID.Parse("00000000-0000-0000-0000-000000000666"); |
| 80 | IDictionary<UUID, int> foundAssetUuids = new Dictionary<UUID, int>(); | 80 | IDictionary<UUID, AssetType> foundAssetUuids = new Dictionary<UUID, AssetType>(); |
| 81 | 81 | ||
| 82 | m_uuidGatherer.GatherAssetUuids(missingAssetUuid, AssetType.Object, foundAssetUuids); | 82 | m_uuidGatherer.GatherAssetUuids(missingAssetUuid, AssetType.Object, foundAssetUuids); |
| 83 | 83 | ||