diff options
author | UbitUmarov | 2018-04-10 07:27:10 +0100 |
---|---|---|
committer | UbitUmarov | 2018-04-10 07:27:10 +0100 |
commit | 63418349e5d8723b977d447a0fbf9d85c1490338 (patch) | |
tree | 5fb75f1ac3519bab94a49a7fa99beb5fd85d28ec /OpenSim/Region/CoreModules | |
parent | mantis 8305: add osTriggerSoundLimited(..) (diff) | |
download | opensim-SC-63418349e5d8723b977d447a0fbf9d85c1490338.zip opensim-SC-63418349e5d8723b977d447a0fbf9d85c1490338.tar.gz opensim-SC-63418349e5d8723b977d447a0fbf9d85c1490338.tar.bz2 opensim-SC-63418349e5d8723b977d447a0fbf9d85c1490338.tar.xz |
mantis 8275: fix llStopSound for llPlaySound. Code was doing as SL wiki but not as not real regions with FireStorm. Singularity will only stop loop sounds. None stops Trigger
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Sound/SoundModule.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs index 2b7db18..662e3fe 100644 --- a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs +++ b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs | |||
@@ -131,6 +131,8 @@ namespace OpenSim.Region.CoreModules.World.Sound | |||
131 | if (!m_scene.TryGetSceneObjectPart(objectID, out part)) | 131 | if (!m_scene.TryGetSceneObjectPart(objectID, out part)) |
132 | return; | 132 | return; |
133 | 133 | ||
134 | part.SoundFlags = 0; | ||
135 | |||
134 | SceneObjectGroup grp = part.ParentGroup; | 136 | SceneObjectGroup grp = part.ParentGroup; |
135 | 137 | ||
136 | if (radius == 0) | 138 | if (radius == 0) |
@@ -199,6 +201,8 @@ namespace OpenSim.Region.CoreModules.World.Sound | |||
199 | } | 201 | } |
200 | } | 202 | } |
201 | 203 | ||
204 | part.SoundFlags = 0; | ||
205 | |||
202 | if (radius == 0) | 206 | if (radius == 0) |
203 | radius = MaxDistance; | 207 | radius = MaxDistance; |
204 | 208 | ||
@@ -225,7 +229,6 @@ namespace OpenSim.Region.CoreModules.World.Sound | |||
225 | 229 | ||
226 | private static void StopSound(SceneObjectPart m_host) | 230 | private static void StopSound(SceneObjectPart m_host) |
227 | { | 231 | { |
228 | // m_host.AdjustSoundGain(0); | ||
229 | m_host.Sound = UUID.Zero; | 232 | m_host.Sound = UUID.Zero; |
230 | m_host.SoundFlags = (byte)SoundFlags.STOP; | 233 | m_host.SoundFlags = (byte)SoundFlags.STOP; |
231 | m_host.SoundRadius = 0; | 234 | m_host.SoundRadius = 0; |