diff options
| author | Melanie | 2010-03-03 02:07:03 +0000 |
|---|---|---|
| committer | Melanie | 2010-03-03 02:07:03 +0000 |
| commit | 028a87fe37002e7a0611f66babf1deee46c83804 (patch) | |
| tree | 387aec499fd60c2012bed8148e6a2ddc847c3d95 /OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs | |
| parent | Revert "test" (diff) | |
| parent | Fixes Region.Framework tests. Although these tests don't fail, they need to b... (diff) | |
| download | opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.zip opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.gz opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.bz2 opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
This brings careminster on the level of master. To be tested
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs b/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs index a36c4db..6686264 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs | |||
| @@ -58,7 +58,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
| 58 | TestHelper.InMethod(); | 58 | TestHelper.InMethod(); |
| 59 | 59 | ||
| 60 | UUID corruptAssetUuid = UUID.Parse("00000000-0000-0000-0000-000000000666"); | 60 | UUID corruptAssetUuid = UUID.Parse("00000000-0000-0000-0000-000000000666"); |
| 61 | AssetBase corruptAsset = AssetHelpers.CreateAsset(corruptAssetUuid, "CORRUPT ASSET"); | 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, int> foundAssetUuids = new Dictionary<UUID, int>(); |