diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 681feea4be..3a39da0102 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2684,6 +2684,10 @@ namespace OpenSim.Region.Framework.Scenes
///
public void SendSound(string sound, double volume, bool triggered, byte flags, float radius, bool useMaster, bool isMaster)
{
+ ISoundModule soundModule = ParentGroup.Scene.RequestModuleInterface();
+ if(soundModule == null)
+ return;
+
volume = Util.Clip((float)volume, 0, 1);
UUID ownerID = OwnerID;
@@ -2713,9 +2717,6 @@ namespace OpenSim.Region.Framework.Scenes
if (soundID == UUID.Zero)
return;
- ISoundModule soundModule = ParentGroup.Scene.RequestModuleInterface();
- if (soundModule != null)
- {
if (useMaster)
{
if (isMaster)
@@ -2761,7 +2762,6 @@ namespace OpenSim.Region.Framework.Scenes
else
soundModule.PlayAttachedSound(soundID, ownerID, objectID, volume, position, flags, radius);
}
- }
}
///