aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Examples/SimpleApp/ComplexObject.cs
diff options
context:
space:
mode:
authorlbsa712007-12-28 08:34:38 +0000
committerlbsa712007-12-28 08:34:38 +0000
commit8cd72beb86d2a563bdaf88b20aa76d9bafa6b971 (patch)
tree8eaac3b70eb4b62db89cdfc7b854e85fa2430255 /OpenSim/Region/Examples/SimpleApp/ComplexObject.cs
parent* Patch from Melanie. Thanks Melanie! (diff)
downloadopensim-SC-8cd72beb86d2a563bdaf88b20aa76d9bafa6b971.zip
opensim-SC-8cd72beb86d2a563bdaf88b20aa76d9bafa6b971.tar.gz
opensim-SC-8cd72beb86d2a563bdaf88b20aa76d9bafa6b971.tar.bz2
opensim-SC-8cd72beb86d2a563bdaf88b20aa76d9bafa6b971.tar.xz
* Moved PrimitiveBaseShape subclasses into factory methods - the subclassing scheme won't hold for serialization
* Extracted out the 'old' AddNewPrimitive that places an object at an exact pos, without the raytracing
Diffstat (limited to 'OpenSim/Region/Examples/SimpleApp/ComplexObject.cs')
-rw-r--r--OpenSim/Region/Examples/SimpleApp/ComplexObject.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Examples/SimpleApp/ComplexObject.cs b/OpenSim/Region/Examples/SimpleApp/ComplexObject.cs
index bfd9d06..06bcdec 100644
--- a/OpenSim/Region/Examples/SimpleApp/ComplexObject.cs
+++ b/OpenSim/Region/Examples/SimpleApp/ComplexObject.cs
@@ -43,7 +43,7 @@ namespace SimpleApp
43 public RotatingWheel(ulong regionHandle, SceneObjectGroup parent, LLUUID ownerID, uint localID, 43 public RotatingWheel(ulong regionHandle, SceneObjectGroup parent, LLUUID ownerID, uint localID,
44 LLVector3 groupPosition, LLVector3 offsetPosition, LLQuaternion rotationDirection) 44 LLVector3 groupPosition, LLVector3 offsetPosition, LLQuaternion rotationDirection)
45 : base( 45 : base(
46 regionHandle, parent, ownerID, localID, new CylinderShape(0.5f, 0.2f), groupPosition, offsetPosition 46 regionHandle, parent, ownerID, localID, PrimitiveBaseShape.CreateCylinder(0.5f, 0.2f), groupPosition, offsetPosition
47 ) 47 )
48 { 48 {
49 m_rotationDirection = rotationDirection; 49 m_rotationDirection = rotationDirection;
@@ -64,7 +64,7 @@ namespace SimpleApp
64 64
65 65
66 public ComplexObject(Scene scene, ulong regionHandle, LLUUID ownerID, uint localID, LLVector3 pos) 66 public ComplexObject(Scene scene, ulong regionHandle, LLUUID ownerID, uint localID, LLVector3 pos)
67 : base(scene, regionHandle, ownerID, localID, pos, BoxShape.Default) 67 : base(scene, regionHandle, ownerID, localID, pos, PrimitiveBaseShape.Default)
68 { 68 {
69 m_rotationDirection = new LLQuaternion(0.05f, 0.1f, 0.15f); 69 m_rotationDirection = new LLQuaternion(0.05f, 0.1f, 0.15f);
70 70