diff options
| author | Melanie | 2012-06-14 00:57:05 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-14 00:57:05 +0100 |
| commit | 36117e079aa8b149b3764d0beb853251ff77ca09 (patch) | |
| tree | 244337e3da7bf5a65c3eaf1396d2a0a8f0d60ef5 /OpenSim/Region/CoreModules | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Add SOG.HasPrivateAttachmentPoint to tell if a SOG has a private attachment p... (diff) | |
| download | opensim-SC_OLD-36117e079aa8b149b3764d0beb853251ff77ca09.zip opensim-SC_OLD-36117e079aa8b149b3764d0beb853251ff77ca09.tar.gz opensim-SC_OLD-36117e079aa8b149b3764d0beb853251ff77ca09.tar.bz2 opensim-SC_OLD-36117e079aa8b149b3764d0beb853251ff77ca09.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Sound/SoundModule.cs | 7 |
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; |