diff options
author | SignpostMarv | 2012-10-06 22:37:27 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-10-29 23:38:59 +0000 |
commit | e5df8cafb8d2cc813824299fe4714ee0ceee30c3 (patch) | |
tree | 652391bee3ea24ec36064a369d15bc215d145135 /OpenSim/Region/CoreModules/World/Sound/SoundModuleNonShared.cs | |
parent | adjusting parameter order of PreloadSound to be more logical (diff) | |
download | opensim-SC_OLD-e5df8cafb8d2cc813824299fe4714ee0ceee30c3.zip opensim-SC_OLD-e5df8cafb8d2cc813824299fe4714ee0ceee30c3.tar.gz opensim-SC_OLD-e5df8cafb8d2cc813824299fe4714ee0ceee30c3.tar.bz2 opensim-SC_OLD-e5df8cafb8d2cc813824299fe4714ee0ceee30c3.tar.xz |
Removing a locked iteration over SceneObjectGroup.LoopSoundSlavePrims as the SL Wiki spec does not state that slaves are set to match master values
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Sound/SoundModuleNonShared.cs | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/OpenSim/Region/CoreModules/World/Sound/SoundModuleNonShared.cs b/OpenSim/Region/CoreModules/World/Sound/SoundModuleNonShared.cs index 5a560d8..7ce13d1 100644 --- a/OpenSim/Region/CoreModules/World/Sound/SoundModuleNonShared.cs +++ b/OpenSim/Region/CoreModules/World/Sound/SoundModuleNonShared.cs | |||
@@ -251,22 +251,7 @@ namespace OpenSim.Region.CoreModules.World.Sound | |||
251 | return; | 251 | return; |
252 | 252 | ||
253 | m_host.ParentGroup.LoopSoundMasterPrim = m_host; | 253 | m_host.ParentGroup.LoopSoundMasterPrim = m_host; |
254 | lock (m_host.ParentGroup.LoopSoundSlavePrims) | ||
255 | { | ||
256 | foreach (SceneObjectPart prim in m_host.ParentGroup.LoopSoundSlavePrims) | ||
257 | { | ||
258 | if (prim.Sound != UUID.Zero) | ||
259 | StopSound(objectID); | ||
260 | |||
261 | prim.Sound = soundID; | ||
262 | prim.SoundGain = volume; | ||
263 | prim.SoundFlags = 1; // looping | ||
264 | prim.SoundRadius = radius; | ||
265 | 254 | ||
266 | prim.ScheduleFullUpdate(); | ||
267 | prim.SendFullUpdateToAllClients(); | ||
268 | } | ||
269 | } | ||
270 | if (m_host.Sound != UUID.Zero) | 255 | if (m_host.Sound != UUID.Zero) |
271 | StopSound(objectID); | 256 | StopSound(objectID); |
272 | 257 | ||