2 files changed, 8 insertions, 8 deletions

diff --git a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
index ea38f06..9028d8d 100644
--- a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
+++ b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
@@ -144,7 +144,7 @@ namespace OpenSim.Framework.Interfaces
         void SendTeleportCancel();

         void SendTeleportLocationStart();

 

-        void SendAvatarData(ulong regionHandle, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos);

+        void SendAvatarData(ulong regionHandle, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos, byte[] textureEntry);

         void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLVector3 velocity);

 

         void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint);

diff --git a/Common/OpenSim.Framework/Types/PrimData.cs b/Common/OpenSim.Framework/Types/PrimData.cs
index 56d41b3..f84ae3e 100644
--- a/Common/OpenSim.Framework/Types/PrimData.cs
+++ b/Common/OpenSim.Framework/Types/PrimData.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Framework.Types
         public sbyte PathTaperY;

         public sbyte PathTwist;

         public sbyte PathTwistBegin;

-        public byte[] Texture;

+        public byte[] TextureEntry; // a LL textureEntry in byte[] format

 

         public Int32 CreationDate;

         public uint OwnerMask = FULL_MASK_PERMISSIONS;

@@ -105,8 +105,8 @@ namespace OpenSim.Framework.Types
             this.PathTwist = (sbyte)data[i++];

             this.PathTwistBegin = (sbyte)data[i++];

             ushort length = (ushort)(data[i++] + (data[i++] << 8));

-            this.Texture = new byte[length];

-            Array.Copy(data, i, Texture, 0, length); i += length;

+            this.TextureEntry = new byte[length];

+            Array.Copy(data, i, TextureEntry, 0, length); i += length;

             this.CreationDate = (Int32)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));

             this.OwnerMask = (uint)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));

             this.NextOwnerMask = (uint)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));

@@ -123,7 +123,7 @@ namespace OpenSim.Framework.Types
         public byte[] ToBytes()

         {

             int i = 0;

-            byte[] bytes = new byte[126 + Texture.Length];

+            byte[] bytes = new byte[126 + TextureEntry.Length];

             Array.Copy(OwnerID.GetBytes(), 0, bytes, i, 16); i += 16;

             bytes[i++] = this.PCode;

             bytes[i++] = (byte)(this.PathBegin % 256);

@@ -154,9 +154,9 @@ namespace OpenSim.Framework.Types
             bytes[i++] = ((byte)this.PathTaperY);

             bytes[i++] = ((byte)this.PathTwist);

             bytes[i++] = ((byte)this.PathTwistBegin);

-            bytes[i++] = (byte)(Texture.Length % 256);

-            bytes[i++] = (byte)((Texture.Length >> 8) % 256);

-            Array.Copy(Texture, 0, bytes, i, Texture.Length); i += Texture.Length;

+            bytes[i++] = (byte)(TextureEntry.Length % 256);

+            bytes[i++] = (byte)((TextureEntry.Length >> 8) % 256);

+            Array.Copy(TextureEntry, 0, bytes, i, TextureEntry.Length); i += TextureEntry.Length;

             bytes[i++] = (byte)(this.CreationDate % 256);

             bytes[i++] = (byte)((this.CreationDate >> 8) % 256);

             bytes[i++] = (byte)((this.CreationDate >> 16) % 256);