aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-01-30 18:38:32 +0000
committerJustin Clarke Casey2009-01-30 18:38:32 +0000
commitf351ab62ec3ca27557ad838a831ebc50fff676f8 (patch)
tree70c15924703a37650f52d75f1458fcc1de82ba9b
parent* minor: stop bothering to set parts to phantom within test setups - tests no... (diff)
downloadopensim-SC-f351ab62ec3ca27557ad838a831ebc50fff676f8.zip
opensim-SC-f351ab62ec3ca27557ad838a831ebc50fff676f8.tar.gz
opensim-SC-f351ab62ec3ca27557ad838a831ebc50fff676f8.tar.bz2
opensim-SC-f351ab62ec3ca27557ad838a831ebc50fff676f8.tar.xz
* furhter simplify test setups for objects
-rw-r--r--OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs16
1 files changed, 6 insertions, 10 deletions
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index 95f6b36..61c2e5e 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -202,7 +202,7 @@ namespace OpenSim.Tests.Common.Setup
202 /// <returns></returns> 202 /// <returns></returns>
203 public static SceneObjectPart AddSceneObject(Scene scene) 203 public static SceneObjectPart AddSceneObject(Scene scene)
204 { 204 {
205 return AddSceneObject(scene, null); 205 return AddSceneObject(scene, "Test Object");
206 } 206 }
207 207
208 /// <summary> 208 /// <summary>
@@ -212,19 +212,15 @@ namespace OpenSim.Tests.Common.Setup
212 /// <param name="name"></param> 212 /// <param name="name"></param>
213 /// <returns></returns> 213 /// <returns></returns>
214 public static SceneObjectPart AddSceneObject(Scene scene, string name) 214 public static SceneObjectPart AddSceneObject(Scene scene, string name)
215 { 215 {
216 SceneObjectGroup sceneObject = new SceneObjectGroup();
217 SceneObjectPart part 216 SceneObjectPart part
218 = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero); 217 = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero);
219 218 part.Name = name;
220 if (name != null)
221 part.Name = name;
222 219
223 //part.UpdatePrimFlags(false, false, true); 220 //part.UpdatePrimFlags(false, false, true);
224 //part.ObjectFlags |= (uint)PrimFlags.Phantom; 221 //part.ObjectFlags |= (uint)PrimFlags.Phantom;
225 sceneObject.SetRootPart(part); 222
226 223 scene.AddNewSceneObject(new SceneObjectGroup(part), false);
227 scene.AddNewSceneObject(sceneObject, false);
228 224
229 return part; 225 return part;
230 } 226 }