diff options
| author | opensim mirror account | 2010-11-19 18:50:05 -0800 |
|---|---|---|
| committer | opensim mirror account | 2010-11-19 18:50:05 -0800 |
| commit | c4dd724cba9fef112093328f972fa7822a8eea51 (patch) | |
| tree | e5fd216ef52ec7b434051ab1893cb4350151d213 /OpenSim | |
| parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
| parent | correct build break. for some reason, xbuild didn't rebuild test dlls (diff) | |
| download | opensim-SC-c4dd724cba9fef112093328f972fa7822a8eea51.zip opensim-SC-c4dd724cba9fef112093328f972fa7822a8eea51.tar.gz opensim-SC-c4dd724cba9fef112093328f972fa7822a8eea51.tar.bz2 opensim-SC-c4dd724cba9fef112093328f972fa7822a8eea51.tar.xz | |
Merge branch 'master' of /var/git/opensim/
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs index 04bdc4f..ade0e11 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | |||
| @@ -230,7 +230,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests | |||
| 230 | // upset load | 230 | // upset load |
| 231 | tar.WriteDir(ArchiveConstants.TERRAINS_PATH); | 231 | tar.WriteDir(ArchiveConstants.TERRAINS_PATH); |
| 232 | 232 | ||
| 233 | tar.WriteFile(ArchiveConstants.CONTROL_FILE_PATH, ArchiveWriteRequestPreparation.Create0p2ControlFile(new Dictionary<string, Object>())); | 233 | tar.WriteFile(ArchiveConstants.CONTROL_FILE_PATH, ArchiveWriteRequestPreparation.CreateControlFile(new Dictionary<string, Object>())); |
| 234 | 234 | ||
| 235 | SceneObjectPart part1 = CreateSceneObjectPart1(); | 235 | SceneObjectPart part1 = CreateSceneObjectPart1(); |
| 236 | SceneObjectGroup object1 = new SceneObjectGroup(part1); | 236 | SceneObjectGroup object1 = new SceneObjectGroup(part1); |
| @@ -329,7 +329,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests | |||
| 329 | TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream); | 329 | TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream); |
| 330 | 330 | ||
| 331 | tar.WriteDir(ArchiveConstants.TERRAINS_PATH); | 331 | tar.WriteDir(ArchiveConstants.TERRAINS_PATH); |
| 332 | tar.WriteFile(ArchiveConstants.CONTROL_FILE_PATH, ArchiveWriteRequestPreparation.Create0p2ControlFile(new Dictionary<string, Object>())); | 332 | tar.WriteFile(ArchiveConstants.CONTROL_FILE_PATH, ArchiveWriteRequestPreparation.CreateControlFile(new Dictionary<string, Object>())); |
| 333 | 333 | ||
| 334 | RegionSettings rs = new RegionSettings(); | 334 | RegionSettings rs = new RegionSettings(); |
| 335 | rs.AgentLimit = 17; | 335 | rs.AgentLimit = 17; |