aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authoralondria2008-03-22 23:02:41 +0000
committeralondria2008-03-22 23:02:41 +0000
commit5ebef6410eeef54e1bd3d00331996daba78aa534 (patch)
treea43204b7a152b00170a9c5a7754908eee74ed58e /OpenSim/Region/ScriptEngine
parent* Miscellaneous comment before I found out that mantis 807 probably isn't an ... (diff)
downloadopensim-SC-5ebef6410eeef54e1bd3d00331996daba78aa534.zip
opensim-SC-5ebef6410eeef54e1bd3d00331996daba78aa534.tar.gz
opensim-SC-5ebef6410eeef54e1bd3d00331996daba78aa534.tar.bz2
opensim-SC-5ebef6410eeef54e1bd3d00331996daba78aa534.tar.xz
Implements llLoopSound(), llStopSound(), and llAdjustSoundVolume().
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs13
1 files changed, 8 insertions, 5 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 56c6b59..efcec75 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -1214,13 +1214,14 @@ namespace OpenSim.Region.ScriptEngine.Common
1214 public void llPlaySound(string sound, double volume) 1214 public void llPlaySound(string sound, double volume)
1215 { 1215 {
1216 m_host.AddScriptLPS(1); 1216 m_host.AddScriptLPS(1);
1217 m_host.SendSound(sound, volume, false); 1217 m_host.SendSound(sound, volume, false, 0);
1218 } 1218 }
1219 1219
1220 public void llLoopSound(string sound, double volume) 1220 public void llLoopSound(string sound, double volume)
1221 { 1221 {
1222 m_host.AddScriptLPS(1); 1222 m_host.AddScriptLPS(1);
1223 NotImplemented("llLoopSound"); 1223 m_host.SendSound(sound, volume, false, 1);
1224 //NotImplemented("llLoopSound");
1224 } 1225 }
1225 1226
1226 public void llLoopSoundMaster(string sound, double volume) 1227 public void llLoopSoundMaster(string sound, double volume)
@@ -1244,13 +1245,14 @@ namespace OpenSim.Region.ScriptEngine.Common
1244 public void llTriggerSound(string sound, double volume) 1245 public void llTriggerSound(string sound, double volume)
1245 { 1246 {
1246 m_host.AddScriptLPS(1); 1247 m_host.AddScriptLPS(1);
1247 m_host.SendSound(sound, volume, true); 1248 m_host.SendSound(sound, volume, true, 0);
1248 } 1249 }
1249 1250
1250 public void llStopSound() 1251 public void llStopSound()
1251 { 1252 {
1252 m_host.AddScriptLPS(1); 1253 m_host.AddScriptLPS(1);
1253 NotImplemented("llStopSound"); 1254 m_host.SendSound(LLUUID.Zero.ToString(), 1.0, false, 2);
1255 //NotImplemented("llStopSound");
1254 } 1256 }
1255 1257
1256 public void llPreloadSound(string sound) 1258 public void llPreloadSound(string sound)
@@ -2609,7 +2611,8 @@ namespace OpenSim.Region.ScriptEngine.Common
2609 public void llAdjustSoundVolume(double volume) 2611 public void llAdjustSoundVolume(double volume)
2610 { 2612 {
2611 m_host.AddScriptLPS(1); 2613 m_host.AddScriptLPS(1);
2612 NotImplemented("llAdjustSoundVolume"); 2614 m_host.AdjustSoundGain(volume);
2615 //NotImplemented("llAdjustSoundVolume");
2613 } 2616 }
2614 2617
2615 public void llSetSoundQueueing(int queue) 2618 public void llSetSoundQueueing(int queue)