Hopefully texturing prims should now work correctly.

3 files changed, 26 insertions, 2 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Primitive.cs b/OpenSim/Region/Environment/Scenes/Primitive.cs
index d23a569..d28e480 100644
--- a/OpenSim/Region/Environment/Scenes/Primitive.cs
+++ b/OpenSim/Region/Environment/Scenes/Primitive.cs
@@ -242,7 +242,8 @@ namespace OpenSim.Region.Environment.Scenes
             pShape.PathTaperY = addPacket.ObjectData.PathTaperY;

             pShape.PathTwist = addPacket.ObjectData.PathTwist;

             pShape.PathTwistBegin = addPacket.ObjectData.PathTwistBegin;

-

+            LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-9999-000000000005"));

+            pShape.TextureEntry = ntex.ToBytes();

             this.updateFlag = 1;

         }

         #endregion

@@ -501,6 +502,17 @@ namespace OpenSim.Region.Environment.Scenes
         }

         #endregion

 

+        #region Texture

+        /// <summary>

+        /// 

+        /// </summary>

+        /// <param name="textureEntry"></param>

+        public void UpdateTextureEntry(byte[] textureEntry)

+        {

+            this.m_Shape.TextureEntry = textureEntry;

+            this.updateFlag = 1;

+        }

+        #endregion

         #region Client Update Methods

 

         /// <summary>

diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index 69eaa75..1753772 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -421,7 +421,18 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="remoteClient"></param>

         public void UpdatePrimTexture(uint localID, byte[] texture, IClientAPI remoteClient)

         {

-            

+             Primitive prim = null;

+             foreach (EntityBase ent in Entities.Values)

+             {

+                 if (ent is SceneObject)

+                 {

+                     prim = ((SceneObject)ent).HasChildPrim(localID);

+                     if (prim != null)

+                     {

+                         prim.UpdateTextureEntry(texture);

+                     }

+                 }

+             }

         }

 

         /// <summary>

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index d1f6038..80c61e1 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -477,6 +477,7 @@ namespace OpenSim.Region.Environment.Scenes
             client.OnUpdatePrimScale += this.UpdatePrimScale;

             client.OnUpdatePrimShape += this.UpdatePrimShape;

             client.OnRequestMapBlocks += this.RequestMapBlocks;

+            client.OnUpdatePrimTexture += this.UpdatePrimTexture;

             client.OnTeleportLocationRequest += this.RequestTeleportLocation;

             client.OnObjectSelect += this.SelectPrim;

             client.OnGrapUpdate += this.MoveObject;