From 5d1d5a22a9590cf8a3475a0bf13a4613b6273bf4 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Mon, 10 Nov 2008 18:10:00 +0000 Subject: * Extend basic scene test to retrieve the object from the scene and match uuids * Decouple sog and sop by removing the need to pass the sog to the sop when it is created - most of the code was doing this operation (and hence duplicating it) anyway * Remove unused constructors --- OpenSim/Region/Examples/SimpleModule/ComplexObject.cs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'OpenSim/Region/Examples/SimpleModule/ComplexObject.cs') diff --git a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs index 607a620..fd37d76 100644 --- a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs +++ b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs @@ -51,9 +51,9 @@ namespace OpenSim.Region.Examples.SimpleModule { } - public RotatingWheel(SceneObjectGroup parent, UUID ownerID, - Vector3 groupPosition, Vector3 offsetPosition, Quaternion rotationDirection) - : base(parent, ownerID, PrimitiveBaseShape.Default, groupPosition, offsetPosition) + public RotatingWheel( + UUID ownerID, Vector3 groupPosition, Vector3 offsetPosition, Quaternion rotationDirection) + : base(ownerID, PrimitiveBaseShape.Default, groupPosition, Quaternion.Identity, offsetPosition) { m_rotationDirection = rotationDirection; @@ -83,24 +83,24 @@ namespace OpenSim.Region.Examples.SimpleModule m_rotationDirection = new Quaternion(0.05f, 0.1f, 0.15f); AddPart( - new RotatingWheel(this, ownerID, pos, new Vector3(0, 0, 0.75f), + new RotatingWheel(ownerID, pos, new Vector3(0, 0, 0.75f), new Quaternion(0.05f, 0, 0))); AddPart( - new RotatingWheel(this, ownerID, pos, new Vector3(0, 0, -0.75f), + new RotatingWheel(ownerID, pos, new Vector3(0, 0, -0.75f), new Quaternion(-0.05f, 0, 0))); AddPart( - new RotatingWheel(this, ownerID, pos, new Vector3(0, 0.75f, 0), + new RotatingWheel(ownerID, pos, new Vector3(0, 0.75f, 0), new Quaternion(0.5f, 0, 0.05f))); AddPart( - new RotatingWheel(this, ownerID, pos, new Vector3(0, -0.75f, 0), + new RotatingWheel(ownerID, pos, new Vector3(0, -0.75f, 0), new Quaternion(-0.5f, 0, -0.05f))); AddPart( - new RotatingWheel(this, ownerID, pos, new Vector3(0.75f, 0, 0), + new RotatingWheel(ownerID, pos, new Vector3(0.75f, 0, 0), new Quaternion(0, 0.5f, 0.05f))); AddPart( - new RotatingWheel(this, ownerID, pos, new Vector3(-0.75f, 0, 0), + new RotatingWheel(ownerID, pos, new Vector3(-0.75f, 0, 0), new Quaternion(0, -0.5f, -0.05f))); RootPart.Flags |= PrimFlags.Touch; -- cgit v1.1