diff options
| author | Charles Krinke | 2008-08-13 15:01:45 +0000 |
|---|---|---|
| committer | Charles Krinke | 2008-08-13 15:01:45 +0000 |
| commit | 9f9e7d98ea51fbe022f465867ca5c41c76838574 (patch) | |
| tree | 5893635e1facdb81d581a39ae6894cddf31ffb38 /OpenSim | |
| parent | Mantis#1941. Thank you kindly, Tyre for a patch that (diff) | |
| download | opensim-SC-9f9e7d98ea51fbe022f465867ca5c41c76838574.zip opensim-SC-9f9e7d98ea51fbe022f465867ca5c41c76838574.tar.gz opensim-SC-9f9e7d98ea51fbe022f465867ca5c41c76838574.tar.bz2 opensim-SC-9f9e7d98ea51fbe022f465867ca5c41c76838574.tar.xz | |
Mantis#1942. Thank you kindly, Tyre for a patch that:
updates llTriggerSound() so it accepts an object inventory name too
This adds the same functionality like Xantor's patch for llPlaySound()
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | 3 | ||||
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index c2f8e96..9d05526 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | |||
| @@ -1807,7 +1807,8 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
| 1807 | public void llTriggerSound(string sound, double volume) | 1807 | public void llTriggerSound(string sound, double volume) |
| 1808 | { | 1808 | { |
| 1809 | m_host.AddScriptLPS(1); | 1809 | m_host.AddScriptLPS(1); |
| 1810 | m_host.SendSound(sound, volume, true, 0); | 1810 | // send the sound, once, to all clients in range |
| 1811 | m_host.SendSound(KeyOrName(sound).ToString(), volume, false, 0); | ||
| 1811 | } | 1812 | } |
| 1812 | 1813 | ||
| 1813 | // Xantor 20080528: Clear prim data of sound instead | 1814 | // Xantor 20080528: Clear prim data of sound instead |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 0cd5954..e0614da 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -1659,7 +1659,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 1659 | public void llTriggerSound(string sound, double volume) | 1659 | public void llTriggerSound(string sound, double volume) |
| 1660 | { | 1660 | { |
| 1661 | m_host.AddScriptLPS(1); | 1661 | m_host.AddScriptLPS(1); |
| 1662 | m_host.SendSound(sound, volume, true, 0); | 1662 | // send the sound, once, to all clients in range |
| 1663 | m_host.SendSound(KeyOrName(sound).ToString(), volume, false, 0); | ||
| 1663 | } | 1664 | } |
| 1664 | 1665 | ||
| 1665 | // Xantor 20080528: Clear prim data of sound instead | 1666 | // Xantor 20080528: Clear prim data of sound instead |