aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorSean Dague2008-11-10 20:42:23 +0000
committerSean Dague2008-11-10 20:42:23 +0000
commit03382c55cbe0d327d6a9f0c4fa792f38d856f47c (patch)
tree8f252e190656c055641e49568e7d2b78e732dc0b
parentLock tests on EntityList.cs, multithreaded object addition (diff)
downloadopensim-SC_OLD-03382c55cbe0d327d6a9f0c4fa792f38d856f47c.zip
opensim-SC_OLD-03382c55cbe0d327d6a9f0c4fa792f38d856f47c.tar.gz
opensim-SC_OLD-03382c55cbe0d327d6a9f0c4fa792f38d856f47c.tar.bz2
opensim-SC_OLD-03382c55cbe0d327d6a9f0c4fa792f38d856f47c.tar.xz
make things compile, but the test still fails because of the root part
changes
-rw-r--r--OpenSim/Region/Environment/Scenes/Tests/EntityListTests.cs3
1 files changed, 0 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Tests/EntityListTests.cs b/OpenSim/Region/Environment/Scenes/Tests/EntityListTests.cs
index f4aa3d8..be12a32 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/EntityListTests.cs
+++ b/OpenSim/Region/Environment/Scenes/Tests/EntityListTests.cs
@@ -87,7 +87,6 @@ namespace OpenSim.Region.Environment.Scenes.Tests
87 //part.UpdatePrimFlags(false, false, true); 87 //part.UpdatePrimFlags(false, false, true);
88 part.ObjectFlags |= (uint)PrimFlags.Phantom; 88 part.ObjectFlags |= (uint)PrimFlags.Phantom;
89 89
90 sceneObject.RootPart = part;
91 sceneObject.AddPart(part); 90 sceneObject.AddPart(part);
92 91
93 scene.AddNewSceneObject(sceneObject, false); 92 scene.AddNewSceneObject(sceneObject, false);
@@ -226,7 +225,6 @@ namespace OpenSim.Region.Environment.Scenes.Tests
226 sop.ObjectFlags |= (uint)PrimFlags.Phantom; 225 sop.ObjectFlags |= (uint)PrimFlags.Phantom;
227 226
228 sog.AddPart(sop); 227 sog.AddPart(sop);
229 sog.RootPart = sop;
230 228
231 scene.AddNewSceneObject(sog, false); 229 scene.AddNewSceneObject(sog, false);
232 230
@@ -246,7 +244,6 @@ namespace OpenSim.Region.Environment.Scenes.Tests
246 sop.ObjectFlags |= (uint)PrimFlags.Phantom; 244 sop.ObjectFlags |= (uint)PrimFlags.Phantom;
247 245
248 sog.AddPart(sop); 246 sog.AddPart(sop);
249 sog.RootPart = sop;
250 247
251 scene.AddNewSceneObject(sog, false); 248 scene.AddNewSceneObject(sog, false);
252 249