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/Region/ClientStack/ClientView.API.cs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/ClientStack')

diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 7a9c6cf..51f02da 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -629,7 +629,7 @@ namespace OpenSim.Region.ClientStack
         }
 
 
-        public void SendPrimitiveToClient2(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, LLQuaternion rotation, LLUUID textureID, uint flags, LLUUID objectID, LLUUID ownerID)
+        public 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)
         {
             ObjectUpdatePacket outPacket = new ObjectUpdatePacket();
             outPacket.RegionData.RegionHandle = regionHandle;
@@ -639,6 +639,8 @@ namespace OpenSim.Region.ClientStack
             outPacket.ObjectData[0].ID = localID;
             outPacket.ObjectData[0].FullID = objectID;
             outPacket.ObjectData[0].OwnerID = ownerID;
+            outPacket.ObjectData[0].Text = enc.GetBytes(text);
+            outPacket.ObjectData[0].ParentID = parentID;
             byte[] pb = pos.GetBytes();
             Array.Copy(pb, 0, outPacket.ObjectData[0].ObjectData, 0, pb.Length);
             byte[] rot = rotation.GetBytes();
@@ -646,7 +648,7 @@ namespace OpenSim.Region.ClientStack
             OutPacket(outPacket);
         }
 
-        public void SendPrimitiveToClient2(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, LLUUID textureID, uint flags, LLUUID objectID, LLUUID ownerID)
+        public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, LLUUID textureID, uint flags, LLUUID objectID, LLUUID ownerID, string text, uint parentID)
         {
             ObjectUpdatePacket outPacket = new ObjectUpdatePacket();
             outPacket.RegionData.RegionHandle = regionHandle;
@@ -656,6 +658,8 @@ namespace OpenSim.Region.ClientStack
             outPacket.ObjectData[0].ID = localID;
             outPacket.ObjectData[0].FullID = objectID;
             outPacket.ObjectData[0].OwnerID = ownerID;
+            outPacket.ObjectData[0].Text = enc.GetBytes(text);
+            outPacket.ObjectData[0].ParentID = parentID;
             byte[] pb = pos.GetBytes();
             Array.Copy(pb, 0, outPacket.ObjectData[0].ObjectData, 0, pb.Length);
 
@@ -876,6 +880,7 @@ namespace OpenSim.Region.ClientStack
             LLObject.TextureEntry ntex = new LLObject.TextureEntry(textureID);
             objectData.TextureEntry = ntex.ToBytes();
             objectData.OwnerID = primData.OwnerID;
+            objectData.ParentID = primData.ParentID;
             objectData.PCode = primData.PCode;
             objectData.PathBegin = primData.PathBegin;
             objectData.PathEnd = primData.PathEnd;
@@ -889,7 +894,6 @@ namespace OpenSim.Region.ClientStack
             objectData.Scale = primData.Scale;
             objectData.PathCurve = primData.PathCurve;
             objectData.ProfileCurve = primData.ProfileCurve;
-            objectData.ParentID = primData.ParentID;
             objectData.ProfileHollow = primData.ProfileHollow;
             objectData.PathRadiusOffset = primData.PathRadiusOffset;
             objectData.PathRevolutions = primData.PathRevolutions;
@@ -916,7 +920,6 @@ namespace OpenSim.Region.ClientStack
             objectData.Scale = primData.Scale;
             objectData.PathCurve = primData.PathCurve;
             objectData.ProfileCurve = primData.ProfileCurve;
-            objectData.ParentID = primData.ParentID;
             objectData.ProfileHollow = primData.ProfileHollow;
             objectData.PathRadiusOffset = primData.PathRadiusOffset;
             objectData.PathRevolutions = primData.PathRevolutions;
-- 
cgit v1.1