aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-06-14 01:12:16 +0100
committerJustin Clark-Casey (justincc)2012-06-14 01:20:55 +0100
commita4290048e5333d34910fd8c4dfd6cb9b5819d1c1 (patch)
tree2615edb0a04edff9f3d412f0f0b7b4a3b676537e /OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
parentminor: remove unnecessary IsAttachment = false setting for new object in Uplo... (diff)
downloadopensim-SC_OLD-a4290048e5333d34910fd8c4dfd6cb9b5819d1c1.zip
opensim-SC_OLD-a4290048e5333d34910fd8c4dfd6cb9b5819d1c1.tar.gz
opensim-SC_OLD-a4290048e5333d34910fd8c4dfd6cb9b5819d1c1.tar.bz2
opensim-SC_OLD-a4290048e5333d34910fd8c4dfd6cb9b5819d1c1.tar.xz
Add SOG.HasPrivateAttachmentPoint to tell if a SOG has a private attachment point. HUDs attachment points are private.
Change SOP.SendFullUpdateToClient() and SoundModule.PlayAttachedSound() to use this rather than different magic number formulations. This also corrects a bug in PlayAttachedSound() where the code assumed that all attachment points over 30 were HUDs. It appears this is no longer true with Neck and Root (Avatar Center)
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Sound/SoundModule.cs')
-rw-r--r--OpenSim/Region/CoreModules/World/Sound/SoundModule.cs7
1 files changed, 2 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
index 93b1005..d768a1a 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
78 78
79 if (grp.IsAttachment) 79 if (grp.IsAttachment)
80 { 80 {
81 if (grp.AttachmentPoint > 30) // HUD 81 if (grp.HasPrivateAttachmentPoint && sp.ControllingClient.AgentId != grp.OwnerID)
82 { 82 return;
83 if (sp.ControllingClient.AgentId != grp.OwnerID)
84 return;
85 }
86 83
87 if (sp.ControllingClient.AgentId == grp.OwnerID) 84 if (sp.ControllingClient.AgentId == grp.OwnerID)
88 dis = 0; 85 dis = 0;