diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Sound/SoundModuleNonShared.cs | 8 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/ISoundModule.cs | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/World/Sound/SoundModuleNonShared.cs b/OpenSim/Region/CoreModules/World/Sound/SoundModuleNonShared.cs index 14914b6..74f2874 100644 --- a/OpenSim/Region/CoreModules/World/Sound/SoundModuleNonShared.cs +++ b/OpenSim/Region/CoreModules/World/Sound/SoundModuleNonShared.cs | |||
@@ -133,7 +133,8 @@ namespace OpenSim.Region.CoreModules.World.Sound | |||
133 | // Scale by distance | 133 | // Scale by distance |
134 | double thisSpGain = gain * ((radius - dis) / radius); | 134 | double thisSpGain = gain * ((radius - dis) / radius); |
135 | 135 | ||
136 | sp.ControllingClient.SendPlayAttachedSound(soundID, objectID, ownerID, (float)thisSpGain, flags); | 136 | sp.ControllingClient.SendPlayAttachedSound(soundID, objectID, |
137 | ownerID, (float)thisSpGain, flags); | ||
137 | }); | 138 | }); |
138 | } | 139 | } |
139 | 140 | ||
@@ -171,8 +172,9 @@ namespace OpenSim.Region.CoreModules.World.Sound | |||
171 | // Scale by distance | 172 | // Scale by distance |
172 | double thisSpGain = gain * ((radius - dis) / radius); | 173 | double thisSpGain = gain * ((radius - dis) / radius); |
173 | 174 | ||
174 | sp.ControllingClient.SendTriggeredSound( | 175 | sp.ControllingClient.SendTriggeredSound(soundId, ownerID, |
175 | soundId, ownerID, objectID, parentID, handle, position, (float)thisSpGain); | 176 | objectID, parentID, handle, position, |
177 | (float)thisSpGain); | ||
176 | }); | 178 | }); |
177 | } | 179 | } |
178 | 180 | ||
diff --git a/OpenSim/Region/Framework/Interfaces/ISoundModule.cs b/OpenSim/Region/Framework/Interfaces/ISoundModule.cs index 4c558cc..945029f 100644 --- a/OpenSim/Region/Framework/Interfaces/ISoundModule.cs +++ b/OpenSim/Region/Framework/Interfaces/ISoundModule.cs | |||
@@ -35,7 +35,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
35 | float MaxDistance { get; } | 35 | float MaxDistance { get; } |
36 | 36 | ||
37 | void PlayAttachedSound(UUID soundID, UUID ownerID, UUID objectID, double gain, Vector3 position, byte flags, float radius); | 37 | void PlayAttachedSound(UUID soundID, UUID ownerID, UUID objectID, double gain, Vector3 position, byte flags, float radius); |
38 | 38 | ||
39 | void TriggerSound( | 39 | void TriggerSound( |
40 | UUID soundId, UUID ownerID, UUID objectID, UUID parentID, double gain, Vector3 position, UInt64 handle, float radius); | 40 | UUID soundId, UUID ownerID, UUID objectID, UUID parentID, double gain, Vector3 position, UInt64 handle, float radius); |
41 | } | 41 | } |