aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Primitive.cs
diff options
context:
space:
mode:
authorMW2007-07-18 21:26:31 +0000
committerMW2007-07-18 21:26:31 +0000
commit4c8b8d22ff66605b11a4881cdb7004cb4ce49592 (patch)
tree6ba59b1027c989614e542b957ebcaeaa8fec0654 /OpenSim/Region/Environment/Scenes/Primitive.cs
parentSculpted Prims should now work. (diff)
downloadopensim-SC-4c8b8d22ff66605b11a4881cdb7004cb4ce49592.zip
opensim-SC-4c8b8d22ff66605b11a4881cdb7004cb4ce49592.tar.gz
opensim-SC-4c8b8d22ff66605b11a4881cdb7004cb4ce49592.tar.bz2
opensim-SC-4c8b8d22ff66605b11a4881cdb7004cb4ce49592.tar.xz
A script/custom application should be able to add a particle system to a prim, just create a new libsecondlife.Primitive.ParticleSystem() and then call AddNewParticleSystem() on the OpenSim particle : we really need to rename our particle class to stop conflict with the one in libsl.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/Primitive.cs9
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Primitive.cs b/OpenSim/Region/Environment/Scenes/Primitive.cs
index bca8e0c..7484393 100644
--- a/OpenSim/Region/Environment/Scenes/Primitive.cs
+++ b/OpenSim/Region/Environment/Scenes/Primitive.cs
@@ -38,6 +38,7 @@ namespace OpenSim.Region.Environment.Scenes
38 public uint BaseMask = FULL_MASK_PERMISSIONS; 38 public uint BaseMask = FULL_MASK_PERMISSIONS;
39 39
40 private PrimitiveBaseShape m_Shape; 40 private PrimitiveBaseShape m_Shape;
41 private byte[] m_particleSystem = new byte[0];
41 42
42 public SceneObject m_RootParent; 43 public SceneObject m_RootParent;
43 public bool m_isRootPrim; 44 public bool m_isRootPrim;
@@ -620,6 +621,12 @@ namespace OpenSim.Region.Environment.Scenes
620 621
621 #endregion 622 #endregion
622 623
624 public void AddNewParticleSystem(libsecondlife.Primitive.ParticleSystem pSystem)
625 {
626 this.m_particleSystem = pSystem.GetBytes();
627 ScheduleFullUpdate();
628 }
629
623 #region Client Update Methods 630 #region Client Update Methods
624 631
625 /// <summary> 632 /// <summary>
@@ -653,7 +660,7 @@ namespace OpenSim.Region.Environment.Scenes
653 lRot = new LLQuaternion(Rotation.x, Rotation.y, Rotation.z, Rotation.w); 660 lRot = new LLQuaternion(Rotation.x, Rotation.y, Rotation.z, Rotation.w);
654 661
655 remoteClient.SendPrimitiveToClient(m_regionHandle, 64096, LocalId, m_Shape, lPos, lRot, m_flags, m_uuid, 662 remoteClient.SendPrimitiveToClient(m_regionHandle, 64096, LocalId, m_Shape, lPos, lRot, m_flags, m_uuid,
656 OwnerID, m_text, ParentID); 663 OwnerID, m_text, ParentID, this.m_particleSystem);
657 } 664 }
658 665
659 /// <summary> 666 /// <summary>