diff options
author | Justin Clark-Casey (justincc) | 2011-08-27 00:33:24 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-08-27 00:33:24 +0100 |
commit | 1615e7d29fb6961a3ffe791fde4318f819c1a4b7 (patch) | |
tree | 5daf5feb054615ff95ec17f7226a377f03df31ab /OpenSim/Region/CoreModules/World/Sound/SoundModule.cs | |
parent | refactor: camel case AttachmentPoint method arg as per code standards (diff) | |
download | opensim-SC_OLD-1615e7d29fb6961a3ffe791fde4318f819c1a4b7.zip opensim-SC_OLD-1615e7d29fb6961a3ffe791fde4318f819c1a4b7.tar.gz opensim-SC_OLD-1615e7d29fb6961a3ffe791fde4318f819c1a4b7.tar.bz2 opensim-SC_OLD-1615e7d29fb6961a3ffe791fde4318f819c1a4b7.tar.xz |
Eliminate duplicate AttachmentPoint properties by always using the one stored in the root part's state field.
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Sound/SoundModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Sound/SoundModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs index 09c0ebb..22ffcd6 100644 --- a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs +++ b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs | |||
@@ -81,7 +81,7 @@ namespace OpenSim.Region.CoreModules.World.Sound | |||
81 | 81 | ||
82 | if (grp.IsAttachment) | 82 | if (grp.IsAttachment) |
83 | { | 83 | { |
84 | if (grp.GetAttachmentPoint() > 30) // HUD | 84 | if (grp.AttachmentPoint > 30) // HUD |
85 | { | 85 | { |
86 | if (sp.ControllingClient.AgentId != grp.OwnerID) | 86 | if (sp.ControllingClient.AgentId != grp.OwnerID) |
87 | return; | 87 | return; |
@@ -115,7 +115,7 @@ namespace OpenSim.Region.CoreModules.World.Sound | |||
115 | { | 115 | { |
116 | SceneObjectGroup grp = part.ParentGroup; | 116 | SceneObjectGroup grp = part.ParentGroup; |
117 | 117 | ||
118 | if (grp.IsAttachment && grp.GetAttachmentPoint() > 30) | 118 | if (grp.IsAttachment && grp.AttachmentPoint > 30) |
119 | { | 119 | { |
120 | objectID = ownerID; | 120 | objectID = ownerID; |
121 | parentID = ownerID; | 121 | parentID = ownerID; |