From 76324e73d32d76f27c1556e82f5817c0cb351367 Mon Sep 17 00:00:00 2001
From: MW <Michaelwri22@yahoo.co.uk>
Date: Sun, 10 Jun 2007 13:06:38 +0000
Subject: [PATCH] allows the texture of the created/sent primitive to be set.

---
 Common/OpenSim.Framework/Interfaces/IClientAPI.cs |  2 +-
 OpenSim/OpenSim.RegionServer/ClientView.API.cs    | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
index f11d0ee006..871b8fd284 100644
--- a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
+++ b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
@@ -102,6 +102,6 @@ namespace OpenSim.Framework.Interfaces
         void InformClientOfNeighbour(ulong neighbourHandle, System.Net.IPAddress neighbourIP, ushort neighbourPort);
         AgentCircuitData RequestClientInfo();
 
-        void SendPrimitiveToClient(PrimData primData, LLVector3 pos);
+        void SendPrimitiveToClient(PrimData primData, LLVector3 pos, LLUUID textureID);
     }
 }
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.API.cs b/OpenSim/OpenSim.RegionServer/ClientView.API.cs
index 94d8cbd83a..09ba26633a 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.API.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.API.cs
@@ -421,11 +421,11 @@ namespace OpenSim
         /// </summary>
         /// <param name="primData"></param>
         /// <param name="pos"></param>
-        public void SendPrimitiveToClient( PrimData primData, LLVector3 pos)
+        public void SendPrimitiveToClient( PrimData primData, LLVector3 pos, LLUUID textureID)
         {
             ObjectUpdatePacket outPacket = new ObjectUpdatePacket();
             outPacket.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];
-            outPacket.ObjectData[0] = this.CreatePrimUpdateBlock(primData);
+            outPacket.ObjectData[0] = this.CreatePrimUpdateBlock(primData, textureID);
             byte[] pb = pos.GetBytes();
             Array.Copy(pb, 0, outPacket.ObjectData[0].ObjectData, 0, pb.Length);
 
@@ -437,10 +437,10 @@ namespace OpenSim
         /// </summary>
         /// <param name="primData"></param>
         /// <returns></returns>
-        protected ObjectUpdatePacket.ObjectDataBlock CreatePrimUpdateBlock(PrimData primData)
+        protected ObjectUpdatePacket.ObjectDataBlock CreatePrimUpdateBlock(PrimData primData, LLUUID textureID)
         {
             ObjectUpdatePacket.ObjectDataBlock objupdate = new ObjectUpdatePacket.ObjectDataBlock();
-            this.SetDefaultPrimPacketValues(objupdate);
+            this.SetDefaultPrimPacketValues(objupdate, textureID);
             objupdate.UpdateFlags = 32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456;
             this.SetPrimPacketShapeData(objupdate, primData);
 
@@ -451,7 +451,7 @@ namespace OpenSim
         /// Set some default values in a ObjectUpdatePacket
         /// </summary>
         /// <param name="objdata"></param>
-        protected void SetDefaultPrimPacketValues(ObjectUpdatePacket.ObjectDataBlock objdata)
+        protected void SetDefaultPrimPacketValues(ObjectUpdatePacket.ObjectDataBlock objdata, LLUUID textureID)
         {
             objdata.PSBlock = new byte[0];
             objdata.ExtraParams = new byte[1];
@@ -464,7 +464,7 @@ namespace OpenSim
             objdata.Material = 3;
             objdata.TextureAnim = new byte[0];
             objdata.Sound = LLUUID.Zero;
-            LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));
+            LLObject.TextureEntry ntex = new LLObject.TextureEntry(textureID);
             objdata.TextureEntry = ntex.ToBytes();
             objdata.State = 0;
             objdata.Data = new byte[0];