aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs16
2 files changed, 16 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
index bad089d..caa3b5c 100644
--- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
@@ -515,7 +515,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
515 LLUUID objectID, LLUUID ownerID, string text, byte[] color, 515 LLUUID objectID, LLUUID ownerID, string text, byte[] color,
516 uint parentID, 516 uint parentID,
517 byte[] particleSystem, byte clickAction, byte[] textureanimation, 517 byte[] particleSystem, byte clickAction, byte[] textureanimation,
518 bool attachment, uint AttachmentPoint, LLUUID AssetId) 518 bool attachment, uint AttachmentPoint, LLUUID AssetId, LLUUID SoundId, double SoundVolume, byte SoundFlags, double SoundRadius)
519 { 519 {
520 } 520 }
521 public virtual void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, 521 public virtual void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID,
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 4610c99..9afffbe 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -592,6 +592,20 @@ namespace OpenSim.Region.Environment.Scenes
592 } 592 }
593 } 593 }
594 594
595 //Xantor 20080528 Sound stuff:
596 // Note: This isn't persisted in the database right now, as the fields for that aren't just there yet.
597 // Not a big problem as long as the script that sets it remains in the prim on startup.
598 // for SL compatibility it should be persisted though (set sound / displaytext / particlesystem, kill script)
599 [XmlIgnore]
600 public LLUUID Sound;
601 [XmlIgnore]
602 public byte SoundFlags;
603 [XmlIgnore]
604 public double SoundGain;
605 [XmlIgnore]
606 public double SoundRadius;
607
608
595 private string m_sitName = String.Empty; 609 private string m_sitName = String.Empty;
596 610
597 public string SitName 611 public string SitName
@@ -2406,7 +2420,7 @@ namespace OpenSim.Region.Environment.Scenes
2406 m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, m_shape, 2420 m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, m_shape,
2407 lPos, Velocity, Acceleration, RotationOffset, RotationalVelocity, clientFlags, m_uuid, 2421 lPos, Velocity, Acceleration, RotationOffset, RotationalVelocity, clientFlags, m_uuid,
2408 OwnerID, 2422 OwnerID,
2409 m_text, color, ParentID, m_particleSystem, m_clickAction, m_TextureAnimation, m_IsAttachment, m_attachmentPoint,fromAssetID); 2423 m_text, color, ParentID, m_particleSystem, m_clickAction, m_TextureAnimation, m_IsAttachment, m_attachmentPoint,fromAssetID, Sound, SoundGain, SoundFlags, SoundRadius);
2410 } 2424 }
2411 2425
2412 /// Terse updates 2426 /// Terse updates