aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs16
1 files changed, 12 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index b232855..5576ec9 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -4579,10 +4579,18 @@ namespace OpenSim.Region.Framework.Scenes
4579 /// <summary> 4579 /// <summary>
4580 /// Update the texture entry for this part. 4580 /// Update the texture entry for this part.
4581 /// </summary> 4581 /// </summary>
4582 /// <param name="textureEntry"></param> 4582 /// <param name="serializedTextureEntry"></param>
4583 public void UpdateTextureEntry(byte[] textureEntry) 4583 public void UpdateTextureEntry(byte[] serializedTextureEntry)
4584 {
4585 UpdateTextureEntry(new Primitive.TextureEntry(serializedTextureEntry, 0, serializedTextureEntry.Length));
4586 }
4587
4588 /// <summary>
4589 /// Update the texture entry for this part.
4590 /// </summary>
4591 /// <param name="newTex"></param>
4592 public void UpdateTextureEntry(Primitive.TextureEntry newTex)
4584 { 4593 {
4585 Primitive.TextureEntry newTex = new Primitive.TextureEntry(textureEntry, 0, textureEntry.Length);
4586 Primitive.TextureEntry oldTex = Shape.Textures; 4594 Primitive.TextureEntry oldTex = Shape.Textures;
4587 4595
4588 Changed changeFlags = 0; 4596 Changed changeFlags = 0;
@@ -4614,7 +4622,7 @@ namespace OpenSim.Region.Framework.Scenes
4614 break; 4622 break;
4615 } 4623 }
4616 4624
4617 m_shape.TextureEntry = textureEntry; 4625 m_shape.TextureEntry = newTex.GetBytes();
4618 if (changeFlags != 0) 4626 if (changeFlags != 0)
4619 TriggerScriptChangedEvent(changeFlags); 4627 TriggerScriptChangedEvent(changeFlags);
4620 UpdateFlag = UpdateRequired.FULL; 4628 UpdateFlag = UpdateRequired.FULL;