diff options
author | Teravus Ovares | 2008-02-02 03:57:57 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-02-02 03:57:57 +0000 |
commit | d4f32649cd298168ec7645ac75f08455e8bed49e (patch) | |
tree | 9e843428a9f84ee88d574cd7b596b5e6d8beaa15 /OpenSim/Region/Environment | |
parent | Added header/footer of scripts to make C# and VB scripts much easier to write. (diff) | |
download | opensim-SC-d4f32649cd298168ec7645ac75f08455e8bed49e.zip opensim-SC-d4f32649cd298168ec7645ac75f08455e8bed49e.tar.gz opensim-SC-d4f32649cd298168ec7645ac75f08455e8bed49e.tar.bz2 opensim-SC-d4f32649cd298168ec7645ac75f08455e8bed49e.tar.xz |
* Committing some untested stuff regarding texture animations. This won't break anything, but the llSetTextureAnim function is completely untested.. (though it may be functional once the script engine works again)
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 452614c..9be75da 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
@@ -276,6 +276,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
276 | } | 276 | } |
277 | } | 277 | } |
278 | 278 | ||
279 | private byte[] m_TextureAnimation; | ||
280 | |||
279 | protected LLVector3 m_offsetPosition; | 281 | protected LLVector3 m_offsetPosition; |
280 | 282 | ||
281 | public LLVector3 OffsetPosition | 283 | public LLVector3 OffsetPosition |
@@ -600,6 +602,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
600 | { | 602 | { |
601 | // It's not necessary to persist this | 603 | // It's not necessary to persist this |
602 | m_inventoryFileName = "taskinventory" + LLUUID.Random().ToString(); | 604 | m_inventoryFileName = "taskinventory" + LLUUID.Random().ToString(); |
605 | m_TextureAnimation = new byte[0]; | ||
603 | } | 606 | } |
604 | 607 | ||
605 | public SceneObjectPart(ulong regionHandle, SceneObjectGroup parent, LLUUID ownerID, uint localID, | 608 | public SceneObjectPart(ulong regionHandle, SceneObjectGroup parent, LLUUID ownerID, uint localID, |
@@ -646,7 +649,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
646 | m_rotationalvelocity = new LLVector3(0, 0, 0); | 649 | m_rotationalvelocity = new LLVector3(0, 0, 0); |
647 | AngularVelocity = new LLVector3(0, 0, 0); | 650 | AngularVelocity = new LLVector3(0, 0, 0); |
648 | Acceleration = new LLVector3(0, 0, 0); | 651 | Acceleration = new LLVector3(0, 0, 0); |
649 | 652 | m_TextureAnimation = new byte[0]; | |
650 | m_inventoryFileName = "taskinventory" + LLUUID.Random().ToString(); | 653 | m_inventoryFileName = "taskinventory" + LLUUID.Random().ToString(); |
651 | m_folderID = LLUUID.Random(); | 654 | m_folderID = LLUUID.Random(); |
652 | 655 | ||
@@ -1364,6 +1367,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
1364 | UpdateTextureEntry(tex.ToBytes()); | 1367 | UpdateTextureEntry(tex.ToBytes()); |
1365 | } | 1368 | } |
1366 | 1369 | ||
1370 | public void AddTextureAnimation(Primitive.TextureAnimation pTexAnim) | ||
1371 | { | ||
1372 | m_TextureAnimation = pTexAnim.GetBytes(); | ||
1373 | } | ||
1374 | |||
1367 | #endregion | 1375 | #endregion |
1368 | 1376 | ||
1369 | #region ParticleSystem | 1377 | #region ParticleSystem |
@@ -1534,7 +1542,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1534 | byte[] color = new byte[] {m_color.R, m_color.G, m_color.B, m_color.A}; | 1542 | byte[] color = new byte[] {m_color.R, m_color.G, m_color.B, m_color.A}; |
1535 | remoteClient.SendPrimitiveToClient(m_regionHandle, 64096, LocalID, m_shape, lPos, clientFlags, m_uuid, | 1543 | remoteClient.SendPrimitiveToClient(m_regionHandle, 64096, LocalID, m_shape, lPos, clientFlags, m_uuid, |
1536 | OwnerID, | 1544 | OwnerID, |
1537 | m_text, color, ParentID, m_particleSystem, lRot, m_clickAction); | 1545 | m_text, color, ParentID, m_particleSystem, lRot, m_clickAction, m_TextureAnimation); |
1538 | } | 1546 | } |
1539 | 1547 | ||
1540 | /// Terse updates | 1548 | /// Terse updates |