sound radius is a prim prop only set by llSetSoundRadius, fix it in case viewers do fix its use (ignored for now)

2 files changed, 14 insertions, 14 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index eae4daf..9799886 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -3178,7 +3178,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 return;
 
             // send the sound, once, to all clients in range           
-            m_SoundModule.SendSound(m_host.UUID, soundID, volume, false, 0, 0, false, false);
+            m_SoundModule.SendSound(m_host.UUID, soundID, volume, false, 0, false, false);
         }
 
         public void llLoopSound(string sound, double volume)
@@ -3192,7 +3192,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if(soundID == UUID.Zero)
                 return;
 
-            m_SoundModule.LoopSound(m_host.UUID, soundID, volume, 20, false,false);
+            m_SoundModule.LoopSound(m_host.UUID, soundID, volume, false,false);
         }
 
         public void llLoopSoundMaster(string sound, double volume)
@@ -3206,7 +3206,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if(soundID == UUID.Zero)
                 return;
 
-            m_SoundModule.LoopSound(m_host.UUID, soundID, volume, 20, true, false);
+            m_SoundModule.LoopSound(m_host.UUID, soundID, volume, true, false);
         }
 
         public void llLoopSoundSlave(string sound, double volume)
@@ -3220,7 +3220,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if(soundID == UUID.Zero)
                 return;
 
-            m_SoundModule.LoopSound(m_host.UUID, soundID, volume, 20, false, true);
+            m_SoundModule.LoopSound(m_host.UUID, soundID, volume, false, true);
         }
 
         public void llPlaySoundSlave(string sound, double volume)
@@ -3235,7 +3235,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 return;
 
             // send the sound, once, to all clients in range
-            m_SoundModule.SendSound(m_host.UUID, soundID, volume, false, 0, 0, true, false);
+            m_SoundModule.SendSound(m_host.UUID, soundID, volume, false, 0, true, false);
         }
 
         public void llTriggerSound(string sound, double volume)
@@ -3250,7 +3250,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 return;
 
             // send the sound, once, to all clients in rangeTrigger or play an attached sound in this part's inventory.
-            m_SoundModule.SendSound(m_host.UUID, soundID, volume, true, 0, 0, false, false);
+            m_SoundModule.SendSound(m_host.UUID, soundID, volume, true, 0, false, false);
         }
 
         public void llStopSound()
@@ -3272,7 +3272,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if(soundID == UUID.Zero)
                 return;
 
-            m_SoundModule.PreloadSound(m_host.UUID, soundID, 0);
+            m_SoundModule.PreloadSound(m_host.UUID, soundID);
             ScriptSleep(m_sleepMsOnPreloadSound);
         }
 
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
                 return;
 
             // send the sound, once, to all clients in range
-            m_SoundModule.SendSound(sop.UUID, soundID, volume, false, 0, 0, false, false);
+            m_SoundModule.SendSound(sop.UUID, soundID, volume, false, 0, false, false);
         }
 
         public void osLoopSound(LSL_Integer linknum, LSL_String sound, LSL_Float volume)
@@ -4891,7 +4891,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if(soundID == UUID.Zero)
                 return;
 
-            m_SoundModule.LoopSound(sop.UUID, soundID, volume, 20, false,false);
+            m_SoundModule.LoopSound(sop.UUID, soundID, volume, false,false);
         }
 
         public void osLoopSoundMaster(LSL_Integer linknum, LSL_String sound, LSL_Float volume)
@@ -4906,7 +4906,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if(soundID == UUID.Zero)
                 return;
 
-            m_SoundModule.LoopSound(sop.UUID, soundID, volume, 20, true, false);
+            m_SoundModule.LoopSound(sop.UUID, soundID, volume, true, false);
         }
 
         public void osLoopSoundSlave(LSL_Integer linknum, LSL_String sound, LSL_Float volume)
@@ -4924,7 +4924,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if(soundID == UUID.Zero)
                 return;
 
-            m_SoundModule.LoopSound(sop.UUID, soundID, volume, 20, false, true);
+            m_SoundModule.LoopSound(sop.UUID, soundID, volume, false, true);
         }
 
         public void osPlaySoundSlave(LSL_Integer linknum, LSL_String sound, LSL_Float volume)
@@ -4943,7 +4943,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 return;
 
             // send the sound, once, to all clients in range
-            m_SoundModule.SendSound(sop.UUID, soundID, volume, false, 0, 0, true, false);
+            m_SoundModule.SendSound(sop.UUID, soundID, volume, false, 0, true, false);
         }
 
         public void osTriggerSound(LSL_Integer linknum, LSL_String sound, LSL_Float volume)
@@ -4962,7 +4962,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 return;
 
             // send the sound, once, to all clients in rangeTrigger or play an attached sound in this part's inventory.
-            m_SoundModule.SendSound(sop.UUID, soundID, volume, true, 0, 0, false, false);
+            m_SoundModule.SendSound(sop.UUID, soundID, volume, true, 0, false, false);
         }
 
        public void osTriggerSoundLimited(LSL_Integer linknum, LSL_String sound, LSL_Float volume,
@@ -5014,7 +5014,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if(soundID == UUID.Zero)
                 return;
 
-            m_SoundModule.PreloadSound(sop.UUID, soundID, 0);
+            m_SoundModule.PreloadSound(sop.UUID, soundID);
             ScriptSleep(1000);
         }