aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
diff options
context:
space:
mode:
authorUbitUmarov2018-04-10 21:45:11 +0100
committerUbitUmarov2018-04-10 21:45:11 +0100
commitca7bd13deed5de68f1d10994af149b4982df154c (patch)
tree3e361854204b573ad5566b008da89ae184fbfee4 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
parentYEngine: apply a few fixes by Mike Rieker (diff)
downloadopensim-SC-ca7bd13deed5de68f1d10994af149b4982df154c.zip
opensim-SC-ca7bd13deed5de68f1d10994af149b4982df154c.tar.gz
opensim-SC-ca7bd13deed5de68f1d10994af149b4982df154c.tar.bz2
opensim-SC-ca7bd13deed5de68f1d10994af149b4982df154c.tar.xz
sound radius is a prim prop only set by llSetSoundRadius, fix it in case viewers do fix its use (ignored for now)
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 06f4fd1..781f1c9 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -4873,7 +4873,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4873 return; 4873 return;
4874 4874
4875 // send the sound, once, to all clients in range 4875 // send the sound, once, to all clients in range
4876 m_SoundModule.SendSound(sop.UUID, soundID, volume, false, 0, 0, false, false); 4876 m_SoundModule.SendSound(sop.UUID, soundID, volume, false, 0, false, false);
4877 } 4877 }
4878 4878
4879 public void osLoopSound(LSL_Integer linknum, LSL_String sound, LSL_Float volume) 4879 public void osLoopSound(LSL_Integer linknum, LSL_String sound, LSL_Float volume)
@@ -4891,7 +4891,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4891 if(soundID == UUID.Zero) 4891 if(soundID == UUID.Zero)
4892 return; 4892 return;
4893 4893
4894 m_SoundModule.LoopSound(sop.UUID, soundID, volume, 20, false,false); 4894 m_SoundModule.LoopSound(sop.UUID, soundID, volume, false,false);
4895 } 4895 }
4896 4896
4897 public void osLoopSoundMaster(LSL_Integer linknum, LSL_String sound, LSL_Float volume) 4897 public void osLoopSoundMaster(LSL_Integer linknum, LSL_String sound, LSL_Float volume)
@@ -4906,7 +4906,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4906 if(soundID == UUID.Zero) 4906 if(soundID == UUID.Zero)
4907 return; 4907 return;
4908 4908
4909 m_SoundModule.LoopSound(sop.UUID, soundID, volume, 20, true, false); 4909 m_SoundModule.LoopSound(sop.UUID, soundID, volume, true, false);
4910 } 4910 }
4911 4911
4912 public void osLoopSoundSlave(LSL_Integer linknum, LSL_String sound, LSL_Float volume) 4912 public void osLoopSoundSlave(LSL_Integer linknum, LSL_String sound, LSL_Float volume)
@@ -4924,7 +4924,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4924 if(soundID == UUID.Zero) 4924 if(soundID == UUID.Zero)
4925 return; 4925 return;
4926 4926
4927 m_SoundModule.LoopSound(sop.UUID, soundID, volume, 20, false, true); 4927 m_SoundModule.LoopSound(sop.UUID, soundID, volume, false, true);
4928 } 4928 }
4929 4929
4930 public void osPlaySoundSlave(LSL_Integer linknum, LSL_String sound, LSL_Float volume) 4930 public void osPlaySoundSlave(LSL_Integer linknum, LSL_String sound, LSL_Float volume)
@@ -4943,7 +4943,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4943 return; 4943 return;
4944 4944
4945 // send the sound, once, to all clients in range 4945 // send the sound, once, to all clients in range
4946 m_SoundModule.SendSound(sop.UUID, soundID, volume, false, 0, 0, true, false); 4946 m_SoundModule.SendSound(sop.UUID, soundID, volume, false, 0, true, false);
4947 } 4947 }
4948 4948
4949 public void osTriggerSound(LSL_Integer linknum, LSL_String sound, LSL_Float volume) 4949 public void osTriggerSound(LSL_Integer linknum, LSL_String sound, LSL_Float volume)
@@ -4962,7 +4962,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4962 return; 4962 return;
4963 4963
4964 // send the sound, once, to all clients in rangeTrigger or play an attached sound in this part's inventory. 4964 // send the sound, once, to all clients in rangeTrigger or play an attached sound in this part's inventory.
4965 m_SoundModule.SendSound(sop.UUID, soundID, volume, true, 0, 0, false, false); 4965 m_SoundModule.SendSound(sop.UUID, soundID, volume, true, 0, false, false);
4966 } 4966 }
4967 4967
4968 public void osTriggerSoundLimited(LSL_Integer linknum, LSL_String sound, LSL_Float volume, 4968 public void osTriggerSoundLimited(LSL_Integer linknum, LSL_String sound, LSL_Float volume,
@@ -5014,7 +5014,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5014 if(soundID == UUID.Zero) 5014 if(soundID == UUID.Zero)
5015 return; 5015 return;
5016 5016
5017 m_SoundModule.PreloadSound(sop.UUID, soundID, 0); 5017 m_SoundModule.PreloadSound(sop.UUID, soundID);
5018 ScriptSleep(1000); 5018 ScriptSleep(1000);
5019 } 5019 }
5020 5020