From 9f9e7d98ea51fbe022f465867ca5c41c76838574 Mon Sep 17 00:00:00 2001
From: Charles Krinke
Date: Wed, 13 Aug 2008 15:01:45 +0000
Subject: 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()

---
 OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs       | 3 ++-
 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
         public void llTriggerSound(string sound, double volume)
         {
             m_host.AddScriptLPS(1);
-            m_host.SendSound(sound, volume, true, 0);
+            // send the sound, once, to all clients in range
+            m_host.SendSound(KeyOrName(sound).ToString(), volume, false, 0);
         }
 
         // 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
         public void llTriggerSound(string sound, double volume)
         {
             m_host.AddScriptLPS(1);
-            m_host.SendSound(sound, volume, true, 0);
+            // send the sound, once, to all clients in range
+            m_host.SendSound(KeyOrName(sound).ToString(), volume, false, 0);
         }
 
         // Xantor 20080528: Clear prim data of sound instead
-- 
cgit v1.1