aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Implementation
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-05-22 20:01:57 +0100
committerJustin Clark-Casey (justincc)2013-05-22 20:01:57 +0100
commit7d38f4940c39b217bcf6b90b7811933099916de9 (patch)
tree75c5a6ef2b670e464cec98d94580f06fd86c38c2 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation
parentRevert "BulletSim: add code to experimentally use asset hull data." (diff)
downloadopensim-SC-7d38f4940c39b217bcf6b90b7811933099916de9.zip
opensim-SC-7d38f4940c39b217bcf6b90b7811933099916de9.tar.gz
opensim-SC-7d38f4940c39b217bcf6b90b7811933099916de9.tar.bz2
opensim-SC-7d38f4940c39b217bcf6b90b7811933099916de9.tar.xz
Implement llSetSoundQueueing().
This is controlled by the viewer, not the server. So as per http://wiki.secondlife.com/wiki/LlSetSoundQueueing, only two sounds can be queued per prim. You probably need to use llPreloadSound() for best results
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs12
1 files changed, 8 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 969243c..0b4b043 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2474,9 +2474,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2474 // send the sound, once, to all clients in range 2474 // send the sound, once, to all clients in range
2475 if (m_SoundModule != null) 2475 if (m_SoundModule != null)
2476 { 2476 {
2477 m_SoundModule.SendSound(m_host.UUID, 2477 m_SoundModule.SendSound(
2478 ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, sound, AssetType.Sound), volume, false, 0, 2478 m_host.UUID,
2479 0, false, false); 2479 ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, sound, AssetType.Sound),
2480 volume, false, m_host.SoundQueueing ? (byte)SoundFlags.Queue : (byte)SoundFlags.None,
2481 0, false, false);
2480 } 2482 }
2481 } 2483 }
2482 2484
@@ -11822,7 +11824,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
11822 public void llSetSoundQueueing(int queue) 11824 public void llSetSoundQueueing(int queue)
11823 { 11825 {
11824 m_host.AddScriptLPS(1); 11826 m_host.AddScriptLPS(1);
11825 NotImplemented("llSetSoundQueueing"); 11827
11828 if (m_SoundModule != null)
11829 m_SoundModule.SetSoundQueueing(m_host.UUID, queue == ScriptBaseClass.TRUE.value);
11826 } 11830 }
11827 11831
11828 public void llCollisionSprite(string impact_sprite) 11832 public void llCollisionSprite(string impact_sprite)