diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index ad3bcd5..36d3588 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -4520,10 +4520,18 @@ namespace OpenSim.Region.Framework.Scenes | |||
4520 | /// <summary> | 4520 | /// <summary> |
4521 | /// Update the texture entry for this part. | 4521 | /// Update the texture entry for this part. |
4522 | /// </summary> | 4522 | /// </summary> |
4523 | /// <param name="textureEntry"></param> | 4523 | /// <param name="serializedTextureEntry"></param> |
4524 | public void UpdateTextureEntry(byte[] textureEntry) | 4524 | public void UpdateTextureEntry(byte[] serializedTextureEntry) |
4525 | { | ||
4526 | UpdateTextureEntry(new Primitive.TextureEntry(serializedTextureEntry, 0, serializedTextureEntry.Length)); | ||
4527 | } | ||
4528 | |||
4529 | /// <summary> | ||
4530 | /// Update the texture entry for this part. | ||
4531 | /// </summary> | ||
4532 | /// <param name="newTex"></param> | ||
4533 | public void UpdateTextureEntry(Primitive.TextureEntry newTex) | ||
4525 | { | 4534 | { |
4526 | Primitive.TextureEntry newTex = new Primitive.TextureEntry(textureEntry, 0, textureEntry.Length); | ||
4527 | Primitive.TextureEntry oldTex = Shape.Textures; | 4535 | Primitive.TextureEntry oldTex = Shape.Textures; |
4528 | 4536 | ||
4529 | Changed changeFlags = 0; | 4537 | Changed changeFlags = 0; |
@@ -4555,7 +4563,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
4555 | break; | 4563 | break; |
4556 | } | 4564 | } |
4557 | 4565 | ||
4558 | m_shape.TextureEntry = textureEntry; | 4566 | m_shape.TextureEntry = newTex.GetBytes(); |
4559 | if (changeFlags != 0) | 4567 | if (changeFlags != 0) |
4560 | TriggerScriptChangedEvent(changeFlags); | 4568 | TriggerScriptChangedEvent(changeFlags); |
4561 | UpdateFlag = UpdateRequired.FULL; | 4569 | UpdateFlag = UpdateRequired.FULL; |