aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-07-07 00:02:45 +0100
committerJustin Clark-Casey (justincc)2012-07-07 00:02:45 +0100
commit7ff4eec79cf16886439604a23126abd195ae8b2e (patch)
treef59be673321e6a74dc429e52e585ef165a8a845d /OpenSim/Tests
parentRemove now duplicate interregion object check that should have been removed a... (diff)
downloadopensim-SC_OLD-7ff4eec79cf16886439604a23126abd195ae8b2e.zip
opensim-SC_OLD-7ff4eec79cf16886439604a23126abd195ae8b2e.tar.gz
opensim-SC_OLD-7ff4eec79cf16886439604a23126abd195ae8b2e.tar.bz2
opensim-SC_OLD-7ff4eec79cf16886439604a23126abd195ae8b2e.tar.xz
Remove redundant SetScene() function in Scene.AddSceneObject()
This is always done later on in SceneGraph.AddSceneObject() if the call hasn't failed due to sanity checks. There's no other purpose for this method to exist and it's dangerous/pointless to call in other conditions.
Diffstat (limited to 'OpenSim/Tests')
-rw-r--r--OpenSim/Tests/Common/Helpers/SceneHelpers.cs23
1 files changed, 20 insertions, 3 deletions
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
index 3a2e420..d5354cb 100644
--- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
@@ -601,19 +601,36 @@ namespace OpenSim.Tests.Common
601 ownerId, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) 601 ownerId, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero)
602 { Name = name, UUID = id, Scale = new Vector3(1, 1, 1) }; 602 { Name = name, UUID = id, Scale = new Vector3(1, 1, 1) };
603 } 603 }
604 604
605 /// <summary> 605 /// <summary>
606 /// Create a scene object but do not add it to the scene. 606 /// Create a scene object but do not add it to the scene.
607 /// </summary> 607 /// </summary>
608 /// <remarks> 608 /// <remarks>
609 /// UUID always starts at 00000000-0000-0000-0000-000000000001 609 /// UUID always starts at 00000000-0000-0000-0000-000000000001. For some purposes, (e.g. serializing direct
610 /// to another object's inventory) we do not need a scene unique ID. So it would be better to add the
611 /// UUID when we actually add an object to a scene rather than on creation.
610 /// </remarks> 612 /// </remarks>
611 /// <param name="parts">The number of parts that should be in the scene object</param> 613 /// <param name="parts">The number of parts that should be in the scene object</param>
612 /// <param name="ownerId"></param> 614 /// <param name="ownerId"></param>
613 /// <returns></returns> 615 /// <returns></returns>
614 public static SceneObjectGroup CreateSceneObject(int parts, UUID ownerId) 616 public static SceneObjectGroup CreateSceneObject(int parts, UUID ownerId)
615 { 617 {
616 return CreateSceneObject(parts, ownerId, "", 0x1); 618 return CreateSceneObject(parts, ownerId, 0x1);
619 }
620
621 /// <summary>
622 /// Create a scene object but do not add it to the scene.
623 /// </summary>
624 /// <param name="parts">The number of parts that should be in the scene object</param>
625 /// <param name="ownerId"></param>
626 /// <param name="uuidTail">
627 /// The hexadecimal last part of the UUID for parts created. A UUID of the form "00000000-0000-0000-0000-{0:XD12}"
628 /// will be given to the root part, and incremented for each part thereafter.
629 /// </param>
630 /// <returns></returns>
631 public static SceneObjectGroup CreateSceneObject(int parts, UUID ownerId, int uuidTail)
632 {
633 return CreateSceneObject(parts, ownerId, "", uuidTail);
617 } 634 }
618 635
619 /// <summary> 636 /// <summary>