ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 06:06:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
UbitUmarov
2018-04-10 21:45:11 +01:00
parent dc35ce26d0
commit ca7bd13dee
8 changed files with 54 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@@ -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);
}

14
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@@ -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);
}