From 54e10e5b61aa543102bcc3a7415877c44aabb5df Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Fri, 7 Nov 2008 21:07:14 +0000
Subject: * Stop requiring local ids in the SOG constructors. * These are
 assigned when the object is attached to the scene

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

(limited to 'OpenSim/Region/Examples/SimpleModule')

diff --git a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
index 3a0b05d..607a620 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, uint localID,
+            public RotatingWheel(SceneObjectGroup parent, UUID ownerID,
                                  Vector3 groupPosition, Vector3 offsetPosition, Quaternion rotationDirection)
-                : base(parent, ownerID, localID, PrimitiveBaseShape.Default, groupPosition, offsetPosition)
+                : base(parent, ownerID, PrimitiveBaseShape.Default, groupPosition, offsetPosition)
             {
                 m_rotationDirection = rotationDirection;
 
@@ -78,29 +78,29 @@ namespace OpenSim.Region.Examples.SimpleModule
         }
 
         public ComplexObject(Scene scene, ulong regionHandle, UUID ownerID, uint localID, Vector3 pos)
-            : base(ownerID, localID, pos, PrimitiveBaseShape.Default)
+            : base(ownerID, pos, PrimitiveBaseShape.Default)
         {
             m_rotationDirection = new Quaternion(0.05f, 0.1f, 0.15f);
 
             AddPart(
-                new RotatingWheel(this, ownerID, scene.PrimIDAllocate(), pos, new Vector3(0, 0, 0.75f),
+                new RotatingWheel(this, ownerID, pos, new Vector3(0, 0, 0.75f),
                                   new Quaternion(0.05f, 0, 0)));
             AddPart(
-                new RotatingWheel(this, ownerID, scene.PrimIDAllocate(), pos, new Vector3(0, 0, -0.75f),
+                new RotatingWheel(this, ownerID, pos, new Vector3(0, 0, -0.75f),
                                   new Quaternion(-0.05f, 0, 0)));
 
             AddPart(
-                new RotatingWheel(this, ownerID, scene.PrimIDAllocate(), pos, new Vector3(0, 0.75f, 0),
+                new RotatingWheel(this, ownerID, pos, new Vector3(0, 0.75f, 0),
                                   new Quaternion(0.5f, 0, 0.05f)));
             AddPart(
-                new RotatingWheel(this, ownerID, scene.PrimIDAllocate(), pos, new Vector3(0, -0.75f, 0),
+                new RotatingWheel(this, ownerID, pos, new Vector3(0, -0.75f, 0),
                                   new Quaternion(-0.5f, 0, -0.05f)));
 
             AddPart(
-                new RotatingWheel(this, ownerID, scene.PrimIDAllocate(), pos, new Vector3(0.75f, 0, 0),
+                new RotatingWheel(this, ownerID, pos, new Vector3(0.75f, 0, 0),
                                   new Quaternion(0, 0.5f, 0.05f)));
             AddPart(
-                new RotatingWheel(this, ownerID, scene.PrimIDAllocate(), pos, new Vector3(-0.75f, 0, 0),
+                new RotatingWheel(this, ownerID, pos, new Vector3(-0.75f, 0, 0),
                                   new Quaternion(0, -0.5f, -0.05f)));
 
             RootPart.Flags |= PrimFlags.Touch;
diff --git a/OpenSim/Region/Examples/SimpleModule/CpuCounterObject.cs b/OpenSim/Region/Examples/SimpleModule/CpuCounterObject.cs
index 83bced5..4038564 100644
--- a/OpenSim/Region/Examples/SimpleModule/CpuCounterObject.cs
+++ b/OpenSim/Region/Examples/SimpleModule/CpuCounterObject.cs
@@ -45,8 +45,8 @@ namespace OpenSim.Region.Examples.SimpleModule
 
         private PerformanceCounter m_counter;
 
-        public CpuCounterObject(UUID ownerID, uint localID, Vector3 pos)
-            : base(ownerID, localID, pos, PrimitiveBaseShape.Default)
+        public CpuCounterObject(UUID ownerID, Vector3 pos)
+            : base(ownerID, pos, PrimitiveBaseShape.Default)
         {
             String objectName = "Processor";
             String counterName = "% Processor Time";
diff --git a/OpenSim/Region/Examples/SimpleModule/FileSystemObject.cs b/OpenSim/Region/Examples/SimpleModule/FileSystemObject.cs
index 0903edd..2b84f1d 100644
--- a/OpenSim/Region/Examples/SimpleModule/FileSystemObject.cs
+++ b/OpenSim/Region/Examples/SimpleModule/FileSystemObject.cs
@@ -34,8 +34,8 @@ namespace OpenSim.Region.Examples.SimpleModule
 {
     public class FileSystemObject : SceneObjectGroup
     {
-        public FileSystemObject(Scene world, FileInfo fileInfo, Vector3 pos)
-            : base(UUID.Zero, world.NextLocalId, pos, PrimitiveBaseShape.Default)
+        public FileSystemObject(FileInfo fileInfo, Vector3 pos)
+            : base(UUID.Zero, pos, PrimitiveBaseShape.Default)
         {
             Text = fileInfo.Name;
         }
-- 
cgit v1.1