aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Examples/SimpleModule
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-10 18:10:00 +0000
committerJustin Clarke Casey2008-11-10 18:10:00 +0000
commit5d1d5a22a9590cf8a3475a0bf13a4613b6273bf4 (patch)
tree8bf214cd45c9a94aae3d6ef8d76169f19006ae41 /OpenSim/Region/Examples/SimpleModule
parentthis changeset adds an option to RemoteAdmin to limit the number of (diff)
downloadopensim-SC_OLD-5d1d5a22a9590cf8a3475a0bf13a4613b6273bf4.zip
opensim-SC_OLD-5d1d5a22a9590cf8a3475a0bf13a4613b6273bf4.tar.gz
opensim-SC_OLD-5d1d5a22a9590cf8a3475a0bf13a4613b6273bf4.tar.bz2
opensim-SC_OLD-5d1d5a22a9590cf8a3475a0bf13a4613b6273bf4.tar.xz
* 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
Diffstat (limited to 'OpenSim/Region/Examples/SimpleModule')
-rw-r--r--OpenSim/Region/Examples/SimpleModule/ComplexObject.cs18
1 files changed, 9 insertions, 9 deletions
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
51 { 51 {
52 } 52 }
53 53
54 public RotatingWheel(SceneObjectGroup parent, UUID ownerID, 54 public RotatingWheel(
55 Vector3 groupPosition, Vector3 offsetPosition, Quaternion rotationDirection) 55 UUID ownerID, Vector3 groupPosition, Vector3 offsetPosition, Quaternion rotationDirection)
56 : base(parent, ownerID, PrimitiveBaseShape.Default, groupPosition, offsetPosition) 56 : base(ownerID, PrimitiveBaseShape.Default, groupPosition, Quaternion.Identity, offsetPosition)
57 { 57 {
58 m_rotationDirection = rotationDirection; 58 m_rotationDirection = rotationDirection;
59 59
@@ -83,24 +83,24 @@ namespace OpenSim.Region.Examples.SimpleModule
83 m_rotationDirection = new Quaternion(0.05f, 0.1f, 0.15f); 83 m_rotationDirection = new Quaternion(0.05f, 0.1f, 0.15f);
84 84
85 AddPart( 85 AddPart(
86 new RotatingWheel(this, ownerID, pos, new Vector3(0, 0, 0.75f), 86 new RotatingWheel(ownerID, pos, new Vector3(0, 0, 0.75f),
87 new Quaternion(0.05f, 0, 0))); 87 new Quaternion(0.05f, 0, 0)));
88 AddPart( 88 AddPart(
89 new RotatingWheel(this, ownerID, pos, new Vector3(0, 0, -0.75f), 89 new RotatingWheel(ownerID, pos, new Vector3(0, 0, -0.75f),
90 new Quaternion(-0.05f, 0, 0))); 90 new Quaternion(-0.05f, 0, 0)));
91 91
92 AddPart( 92 AddPart(
93 new RotatingWheel(this, ownerID, pos, new Vector3(0, 0.75f, 0), 93 new RotatingWheel(ownerID, pos, new Vector3(0, 0.75f, 0),
94 new Quaternion(0.5f, 0, 0.05f))); 94 new Quaternion(0.5f, 0, 0.05f)));
95 AddPart( 95 AddPart(
96 new RotatingWheel(this, ownerID, pos, new Vector3(0, -0.75f, 0), 96 new RotatingWheel(ownerID, pos, new Vector3(0, -0.75f, 0),
97 new Quaternion(-0.5f, 0, -0.05f))); 97 new Quaternion(-0.5f, 0, -0.05f)));
98 98
99 AddPart( 99 AddPart(
100 new RotatingWheel(this, ownerID, pos, new Vector3(0.75f, 0, 0), 100 new RotatingWheel(ownerID, pos, new Vector3(0.75f, 0, 0),
101 new Quaternion(0, 0.5f, 0.05f))); 101 new Quaternion(0, 0.5f, 0.05f)));
102 AddPart( 102 AddPart(
103 new RotatingWheel(this, ownerID, pos, new Vector3(-0.75f, 0, 0), 103 new RotatingWheel(ownerID, pos, new Vector3(-0.75f, 0, 0),
104 new Quaternion(0, -0.5f, -0.05f))); 104 new Quaternion(0, -0.5f, -0.05f)));
105 105
106 RootPart.Flags |= PrimFlags.Touch; 106 RootPart.Flags |= PrimFlags.Touch;