diff options
| author | Justin Clark-Casey (justincc) | 2009-11-09 17:36:28 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2009-11-09 17:36:28 +0000 |
| commit | 7f5d0a6735585d47e081cb0b717de46d5e23260d (patch) | |
| tree | d463176be6e07c4bb6948f428958fe7452866758 /OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests | |
| parent | refactor out iar escaping (diff) | |
| parent | remove the debug stuff (diff) | |
| download | opensim-SC_OLD-7f5d0a6735585d47e081cb0b717de46d5e23260d.zip opensim-SC_OLD-7f5d0a6735585d47e081cb0b717de46d5e23260d.tar.gz opensim-SC_OLD-7f5d0a6735585d47e081cb0b717de46d5e23260d.tar.bz2 opensim-SC_OLD-7f5d0a6735585d47e081cb0b717de46d5e23260d.tar.xz | |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs index bcae5f5..99d02c4 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | |||
| @@ -122,8 +122,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
| 122 | } | 122 | } |
| 123 | 123 | ||
| 124 | UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060"); | 124 | UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060"); |
| 125 | AssetBase asset1 = new AssetBase(); | 125 | AssetBase asset1 = new AssetBase(asset1Id, asset1Id.ToString(), (sbyte)AssetType.Object); |
| 126 | asset1.FullID = asset1Id; | ||
| 127 | asset1.Data = Encoding.ASCII.GetBytes(SceneObjectSerializer.ToXml2Format(object1)); | 126 | asset1.Data = Encoding.ASCII.GetBytes(SceneObjectSerializer.ToXml2Format(object1)); |
| 128 | scene.AssetService.Store(asset1); | 127 | scene.AssetService.Store(asset1); |
| 129 | 128 | ||
| @@ -339,8 +338,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
| 339 | } | 338 | } |
| 340 | 339 | ||
| 341 | UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060"); | 340 | UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060"); |
| 342 | AssetBase asset1 = new AssetBase(); | 341 | AssetBase asset1 = new AssetBase(asset1Id, String.Empty, (sbyte)AssetType.Object); |
| 343 | asset1.FullID = asset1Id; | ||
| 344 | asset1.Data = Encoding.ASCII.GetBytes(SceneObjectSerializer.ToXml2Format(object1)); | 342 | asset1.Data = Encoding.ASCII.GetBytes(SceneObjectSerializer.ToXml2Format(object1)); |
| 345 | scene.AssetService.Store(asset1); | 343 | scene.AssetService.Store(asset1); |
| 346 | 344 | ||