From 2852cda727f86567c18c6fab193ed31195c9934c Mon Sep 17 00:00:00 2001
From: MW
Date: Sun, 1 Jul 2007 21:04:33 +0000
Subject: More work on SceneObject/Primitive and building (Linking is a work in
 progress as is all). Committing now as I've finished for the night and will
 be continued tomorrow.

---
 OpenSim/Framework/General/Interfaces/IClientAPI.cs    | 4 ++--
 OpenSim/Framework/General/Types/PrimitiveBaseShape.cs | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
index 2110b74..d62247c 100644
--- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs
+++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
@@ -163,8 +163,8 @@ namespace OpenSim.Framework.Interfaces
         void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint);
         void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimData primData, LLVector3 pos, LLQuaternion rotation, LLUUID textureID , uint flags);
         void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimData primData, LLVector3 pos, LLUUID textureID, uint flags);
-        void SendPrimitiveToClient2(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, LLQuaternion rotation, LLUUID textureID, uint flags, LLUUID objectID, LLUUID ownerID);
-        void SendPrimitiveToClient2(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, LLUUID textureID, uint flags, LLUUID objectID, LLUUID ownerID);
+        void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, LLQuaternion rotation, LLUUID textureID, uint flags, LLUUID objectID, LLUUID ownerID, string text, uint parentID);
+        void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, LLUUID textureID, uint flags, LLUUID objectID, LLUUID ownerID, string text, uint parentID);
         void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLQuaternion rotation);
     }
 }
diff --git a/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs b/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs
index 094a8a0..7c8de16 100644
--- a/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs
@@ -36,7 +36,6 @@ namespace OpenSim.Framework.Types
         public LLVector3 Scale;
         public byte PathCurve;
         public byte ProfileCurve;
-        public uint ParentID = 0;
         public ushort ProfileHollow;
         public sbyte PathRadiusOffset;
         public byte PathRevolutions;
@@ -73,13 +72,13 @@ namespace OpenSim.Framework.Types
 
         }
 
-        public static PrimitiveBaseShape DefaultCube()
+        public static PrimitiveBaseShape DefaultBox()
         {
             PrimitiveBaseShape primShape = new PrimitiveBaseShape();
 
+            primShape.type = ShapeType.Box;
             primShape.Scale = new LLVector3(0.5f, 0.5f, 0.5f);
             primShape.PCode = 9;
-            primShape.ParentID = 0;
             primShape.PathBegin = 0;
             primShape.PathEnd = 0;
             primShape.PathScaleX = 0;
-- 
cgit v1.1