From 84c2a72140822fc28da3590b48db392d132ef0ea Mon Sep 17 00:00:00 2001
From: MW
Date: Sun, 25 Mar 2007 20:23:06 +0000
Subject: Hopefully fixed the texture uploading and the crashing when a prim
 with a uploaded texture on it is moved.

---
 OpenSim.RegionServer/world/Primitive.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'OpenSim.RegionServer/world/Primitive.cs')

diff --git a/OpenSim.RegionServer/world/Primitive.cs b/OpenSim.RegionServer/world/Primitive.cs
index b190d81..6ff66a3 100644
--- a/OpenSim.RegionServer/world/Primitive.cs
+++ b/OpenSim.RegionServer/world/Primitive.cs
@@ -220,7 +220,8 @@ namespace OpenSim.world
 
         public void UpdateTexture(byte[] tex)
         {
-            this.primData.Texture = this.OurPacket.ObjectData[0].TextureEntry = tex;
+            this.OurPacket.ObjectData[0].TextureEntry = tex;
+            this.primData.Texture = tex;
             this.dirtyFlag = true;
         }
 
@@ -401,8 +402,9 @@ namespace OpenSim.world
 
             int i = 0;
             ImprovedTerseObjectUpdatePacket.ObjectDataBlock dat = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock();
-            dat.TextureEntry = this.OurPacket.ObjectData[0].TextureEntry;
-
+            //dat.TextureEntry = this.OurPacket.ObjectData[0].TextureEntry;
+            dat.TextureEntry = new byte[0];
+            //Console.WriteLine("texture-entry length in improvedterse block is " + this.OurPacket.ObjectData[0].TextureEntry.Length);
             bytes[i++] = (byte)(ID % 256);
             bytes[i++] = (byte)((ID >> 8) % 256);
             bytes[i++] = (byte)((ID >> 16) % 256);
-- 
cgit v1.1