From 8cd72beb86d2a563bdaf88b20aa76d9bafa6b971 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Fri, 28 Dec 2007 08:34:38 +0000
Subject: * 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

---
 OpenSim/Region/Examples/SimpleApp/ComplexObject.cs    | 4 ++--
 OpenSim/Region/Examples/SimpleApp/CpuCounterObject.cs | 2 +-
 OpenSim/Region/Examples/SimpleApp/FileSystemObject.cs | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/Examples')

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
             public RotatingWheel(ulong regionHandle, SceneObjectGroup parent, LLUUID ownerID, uint localID,
                                  LLVector3 groupPosition, LLVector3 offsetPosition, LLQuaternion rotationDirection)
                 : base(
-                    regionHandle, parent, ownerID, localID, new CylinderShape(0.5f, 0.2f), groupPosition, offsetPosition
+                    regionHandle, parent, ownerID, localID, PrimitiveBaseShape.CreateCylinder(0.5f, 0.2f), groupPosition, offsetPosition
                     )
             {
                 m_rotationDirection = rotationDirection;
@@ -64,7 +64,7 @@ namespace SimpleApp
 
 
         public ComplexObject(Scene scene, ulong regionHandle, LLUUID ownerID, uint localID, LLVector3 pos)
-            : base(scene, regionHandle, ownerID, localID, pos, BoxShape.Default)
+            : base(scene, regionHandle, ownerID, localID, pos, PrimitiveBaseShape.Default)
         {
             m_rotationDirection = new LLQuaternion(0.05f, 0.1f, 0.15f);
 
diff --git a/OpenSim/Region/Examples/SimpleApp/CpuCounterObject.cs b/OpenSim/Region/Examples/SimpleApp/CpuCounterObject.cs
index cbc4dea..041050d 100644
--- a/OpenSim/Region/Examples/SimpleApp/CpuCounterObject.cs
+++ b/OpenSim/Region/Examples/SimpleApp/CpuCounterObject.cs
@@ -39,7 +39,7 @@ namespace SimpleApp
         private PerformanceCounter m_counter;
 
         public CpuCounterObject(Scene world, ulong regionHandle, LLUUID ownerID, uint localID, LLVector3 pos)
-            : base(world, regionHandle, ownerID, localID, pos, BoxShape.Default)
+            : base(world, regionHandle, ownerID, localID, pos, PrimitiveBaseShape.Default)
         {
             String objectName = "Processor";
             String counterName = "% Processor Time";
diff --git a/OpenSim/Region/Examples/SimpleApp/FileSystemObject.cs b/OpenSim/Region/Examples/SimpleApp/FileSystemObject.cs
index 2d8441e..3fe15ff 100644
--- a/OpenSim/Region/Examples/SimpleApp/FileSystemObject.cs
+++ b/OpenSim/Region/Examples/SimpleApp/FileSystemObject.cs
@@ -36,7 +36,7 @@ namespace SimpleApp
     public class FileSystemObject : SceneObjectGroup
     {
         public FileSystemObject(Scene world, FileInfo fileInfo, LLVector3 pos)
-            : base(world, world.RegionInfo.RegionHandle, LLUUID.Zero, world.NextLocalId, pos, BoxShape.Default)
+            : base(world, world.RegionInfo.RegionHandle, LLUUID.Zero, world.NextLocalId, pos, PrimitiveBaseShape.Default)
         {
             //float size = (float) Math.Pow((double) fileInfo.Length, (double) 1/3)/5;
             // rootPrimitive.ResizeGoup(new LLVector3(size, size, size));
-- 
cgit v1.1