From c2bd6ccdb8f9a5063450f684c31d75df537ff5e8 Mon Sep 17 00:00:00 2001
From: Melanie <melanie@t-data.com>
Date: Wed, 3 Nov 2010 23:20:30 +0100
Subject: [PATCH] Fix playing sound from HUDs

---
 .../CoreModules/World/Sound/SoundModule.cs     | 18 ++++++++++++++++--
 .../Region/Framework/Scenes/SceneObjectPart.cs |  8 --------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
index e77062b17f..8df645dd32 100644
--- a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
+++ b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
@@ -31,12 +31,14 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+using System.Reflection;
+using log4net;
 
 namespace OpenSim.Region.CoreModules.World.Sound
 {
     public class SoundModule : IRegionModule, ISoundModule
     {
-        //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         
         protected Scene m_scene;
         
@@ -79,7 +81,6 @@ namespace OpenSim.Region.CoreModules.World.Sound
 
                 if (grp.IsAttachment)
                 {
-
                     if (grp.GetAttachmentPoint() > 30) // HUD
                     {
                         if (sp.ControllingClient.AgentId != grp.OwnerID)
@@ -96,6 +97,7 @@ namespace OpenSim.Region.CoreModules.World.Sound
                 else
                     gain = (float)((double)gain * ((radius - dis) / radius));
 
+                m_log.DebugFormat("Play sound, gain {0}", gain);
                 sp.ControllingClient.SendPlayAttachedSound(soundID, objectID, ownerID, (float)gain, flags);
             });
         }
@@ -103,6 +105,18 @@ namespace OpenSim.Region.CoreModules.World.Sound
         public virtual void TriggerSound(
             UUID soundId, UUID ownerID, UUID objectID, UUID parentID, double gain, Vector3 position, UInt64 handle, float radius)
         {
+            SceneObjectPart part = m_scene.GetSceneObjectPart(objectID);
+            if (part == null)
+                return;
+
+            SceneObjectGroup grp = part.ParentGroup;
+
+            if (grp.IsAttachment && grp.GetAttachmentPoint() > 30)
+            {
+                objectID = ownerID;
+                parentID = ownerID;
+            }
+
             m_scene.ForEachScenePresence(delegate(ScenePresence sp)
             {
                 if (sp.IsChildAgent)
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 55213260f8..be3e87f552 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -3115,14 +3115,6 @@ namespace OpenSim.Region.Framework.Scenes
             UUID objectID = ParentGroup.RootPart.UUID;
             UUID parentID = GetRootPartUUID();
 
-            if (ParentGroup.IsAttachment && ParentGroup.RootPart.Shape.State > 30)
-            {
-                // Use the avatar as the parent for HUDs, since the prims
-                // are not sent to other avatars
-                objectID = _ownerID;
-                parentID = _ownerID;
-            }
-
             UUID soundID = UUID.Zero;
             Vector3 position = AbsolutePosition; // region local
             ulong regionHandle = m_parentGroup.Scene.RegionInfo.RegionHandle;