diff --git a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
index 93b10052fc..d768a1ac16 100644
--- a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
+++ b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
@@ -78,11 +78,8 @@ namespace OpenSim.Region.CoreModules.World.Sound
if (grp.IsAttachment)
{
- if (grp.AttachmentPoint > 30) // HUD
- {
- if (sp.ControllingClient.AgentId != grp.OwnerID)
- return;
- }
+ if (grp.HasPrivateAttachmentPoint && sp.ControllingClient.AgentId != grp.OwnerID)
+ return;
if (sp.ControllingClient.AgentId == grp.OwnerID)
dis = 0;
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index da4abc1e11..29494b88f2 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -180,6 +180,22 @@ namespace OpenSim.Region.Framework.Scenes
}
}
+ ///
+ /// If this scene object has an attachment point then indicate whether there is a point where
+ /// attachments are perceivable by avatars other than the avatar to which this object is attached.
+ ///
+ ///
+ /// HUDs are not perceivable by other avatars.
+ ///
+ public bool HasPrivateAttachmentPoint
+ {
+ get
+ {
+ return AttachmentPoint >= (uint)OpenMetaverse.AttachmentPoint.HUDCenter2
+ && AttachmentPoint <= (uint)OpenMetaverse.AttachmentPoint.HUDBottomRight;
+ }
+ }
+
public void ClearPartAttachmentData()
{
AttachmentPoint = 0;
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 602a3468a8..234dc929be 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2898,8 +2898,9 @@ namespace OpenSim.Region.Framework.Scenes
if (ParentGroup.IsDeleted)
return;
- if (ParentGroup.IsAttachment && (ParentGroup.AttachedAvatar != remoteClient.AgentId) &&
- (ParentGroup.AttachmentPoint >= 31) && (ParentGroup.AttachmentPoint <= 38))
+ if (ParentGroup.IsAttachment
+ && ParentGroup.AttachedAvatar != remoteClient.AgentId
+ && ParentGroup.HasPrivateAttachmentPoint)
return;
if (remoteClient.AgentId == OwnerID)