aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJohn Hurliman2009-11-06 00:06:49 -0800
committerJohn Hurliman2009-11-06 00:06:49 -0800
commit1cddc850783c4dcf49ca3cd845fdc811ffb20dea (patch)
tree9b093b5ed4fc4c3905629125e50909062145290d /OpenSim/Region
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-1cddc850783c4dcf49ca3cd845fdc811ffb20dea.zip
opensim-SC-1cddc850783c4dcf49ca3cd845fdc811ffb20dea.tar.gz
opensim-SC-1cddc850783c4dcf49ca3cd845fdc811ffb20dea.tar.bz2
opensim-SC-1cddc850783c4dcf49ca3cd845fdc811ffb20dea.tar.xz
Fixing the build break
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index 41bb9dc..e300eb1 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -337,8 +337,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
337 } 337 }
338 338
339 UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060"); 339 UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060");
340 AssetBase asset1 = new AssetBase(); 340 AssetBase asset1 = new AssetBase(asset1Id, String.Empty, (sbyte)AssetType.Object);
341 asset1.FullID = asset1Id;
342 asset1.Data = Encoding.ASCII.GetBytes(SceneObjectSerializer.ToXml2Format(object1)); 341 asset1.Data = Encoding.ASCII.GetBytes(SceneObjectSerializer.ToXml2Format(object1));
343 scene.AssetService.Store(asset1); 342 scene.AssetService.Store(asset1);
344 343