aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-01-30 18:28:05 +0000
committerJustin Clarke Casey2009-01-30 18:28:05 +0000
commit7a751f6940c99d75be96bfe9b5f151a7ae223c25 (patch)
tree9cd3e9c2284cc5fdfc1b26210e27712d8647e202 /OpenSim
parentreporting original request URI if HttpWebRequest failed, adding (diff)
downloadopensim-SC_OLD-7a751f6940c99d75be96bfe9b5f151a7ae223c25.zip
opensim-SC_OLD-7a751f6940c99d75be96bfe9b5f151a7ae223c25.tar.gz
opensim-SC_OLD-7a751f6940c99d75be96bfe9b5f151a7ae223c25.tar.bz2
opensim-SC_OLD-7a751f6940c99d75be96bfe9b5f151a7ae223c25.tar.xz
* minor: stop bothering to set parts to phantom within test setups - tests now seem to pass without having to do this
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Archiver/Tests/ArchiverTests.cs1
-rw-r--r--OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs2
2 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/Environment/Modules/World/Archiver/Tests/ArchiverTests.cs
index 4f4f53c..6450238 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/Tests/ArchiverTests.cs
@@ -52,6 +52,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver.Tests
52 52
53 Scene scene = SceneSetupHelpers.SetupScene(); 53 Scene scene = SceneSetupHelpers.SetupScene();
54 SceneSetupHelpers.SetupSceneModules(scene, archiverModule, terrainModule); 54 SceneSetupHelpers.SetupSceneModules(scene, archiverModule, terrainModule);
55
55 56
56 MemoryStream archiveWriteStream = new MemoryStream(); 57 MemoryStream archiveWriteStream = new MemoryStream();
57 archiverModule.ArchiveRegion(archiveWriteStream); 58 archiverModule.ArchiveRegion(archiveWriteStream);
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index 44c32ff..95f6b36 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -221,7 +221,7 @@ namespace OpenSim.Tests.Common.Setup
221 part.Name = name; 221 part.Name = name;
222 222
223 //part.UpdatePrimFlags(false, false, true); 223 //part.UpdatePrimFlags(false, false, true);
224 part.ObjectFlags |= (uint)PrimFlags.Phantom; 224 //part.ObjectFlags |= (uint)PrimFlags.Phantom;
225 sceneObject.SetRootPart(part); 225 sceneObject.SetRootPart(part);
226 226
227 scene.AddNewSceneObject(sceneObject, false); 227 scene.AddNewSceneObject(sceneObject, false);