aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
authorCharles Krinke2008-05-28 14:03:08 +0000
committerCharles Krinke2008-05-28 14:03:08 +0000
commit06147d0492e91c06a7d8f3a19c20897033f560a3 (patch)
tree5010f60eafa04b6907c5edc5d2233b06584d4c8e /OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
parentMantis#1398. Thank you kindly, cmickeyb for a patch that: (diff)
downloadopensim-SC-06147d0492e91c06a7d8f3a19c20897033f560a3.zip
opensim-SC-06147d0492e91c06a7d8f3a19c20897033f560a3.tar.gz
opensim-SC-06147d0492e91c06a7d8f3a19c20897033f560a3.tar.bz2
opensim-SC-06147d0492e91c06a7d8f3a19c20897033f560a3.tar.xz
Mantis#1406. Thank you kindly, Xantor for a patch that:
llLoopSound sends out one packet to clients in view, so it doesn't work anymore when clients enter later on, or the prim is modified in any way. Solution: Stored sound data on prim, send full update instead. llStartSound and llLoopSound now accept both LLUUIDs to a sound as well as object inventory sound names. llStopSound clears prim data and sends full update.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectPart.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs16
1 files changed, 15 insertions, 1 deletions
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