diff options
| author | Justin Clark-Casey (justincc) | 2010-09-08 01:05:56 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-09-08 01:05:56 +0100 |
| commit | b8d14fcc4a7d819af5015144518ce31cd86d0383 (patch) | |
| tree | 67119cd2cb9bf00e7bbc9ef0e9c4f139f4dbc643 /OpenSim/Region/CoreModules/World | |
| parent | If a scene object part UUID is changed (only possible when not in a scene), t... (diff) | |
| parent | Rolling back the recent libomv update but keeping the ExpiringCache cleanups ... (diff) | |
| download | opensim-SC_OLD-b8d14fcc4a7d819af5015144518ce31cd86d0383.zip opensim-SC_OLD-b8d14fcc4a7d819af5015144518ce31cd86d0383.tar.gz opensim-SC_OLD-b8d14fcc4a7d819af5015144518ce31cd86d0383.tar.bz2 opensim-SC_OLD-b8d14fcc4a7d819af5015144518ce31cd86d0383.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs index 32b3724..3342164 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | |||
| @@ -48,6 +48,7 @@ using OpenSim.Tests.Common.Setup; | |||
| 48 | using ArchiveConstants = OpenSim.Framework.Serialization.ArchiveConstants; | 48 | using ArchiveConstants = OpenSim.Framework.Serialization.ArchiveConstants; |
| 49 | using TarArchiveReader = OpenSim.Framework.Serialization.TarArchiveReader; | 49 | using TarArchiveReader = OpenSim.Framework.Serialization.TarArchiveReader; |
| 50 | using TarArchiveWriter = OpenSim.Framework.Serialization.TarArchiveWriter; | 50 | using TarArchiveWriter = OpenSim.Framework.Serialization.TarArchiveWriter; |
| 51 | using RegionSettings = OpenSim.Framework.RegionSettings; | ||
| 51 | 52 | ||
| 52 | namespace OpenSim.Region.CoreModules.World.Archiver.Tests | 53 | namespace OpenSim.Region.CoreModules.World.Archiver.Tests |
| 53 | { | 54 | { |
| @@ -135,7 +136,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests | |||
| 135 | 136 | ||
| 136 | SceneObjectPart part2 = CreateSceneObjectPart2(); | 137 | SceneObjectPart part2 = CreateSceneObjectPart2(); |
| 137 | 138 | ||
| 138 | AssetNotecard nc = new AssetNotecard("Hello World!"); | 139 | AssetNotecard nc = new AssetNotecard(); |
| 140 | nc.BodyText = "Hello World!"; | ||
| 141 | nc.Encode(); | ||
| 139 | UUID ncAssetUuid = new UUID("00000000-0000-0000-1000-000000000000"); | 142 | UUID ncAssetUuid = new UUID("00000000-0000-0000-1000-000000000000"); |
| 140 | UUID ncItemUuid = new UUID("00000000-0000-0000-1100-000000000000"); | 143 | UUID ncItemUuid = new UUID("00000000-0000-0000-1100-000000000000"); |
| 141 | AssetBase ncAsset | 144 | AssetBase ncAsset |