shuffling code around so that the interface for ISoundModule.SendSound() specifies a UUID rather than a string

2 files changed, 2 insertions, 2 deletions

diff --git a/OpenSim/Region/Framework/Interfaces/ISoundModule.cs b/OpenSim/Region/Framework/Interfaces/ISoundModule.cs
index c5edcb0..5d1bb63 100644
--- a/OpenSim/Region/Framework/Interfaces/ISoundModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/ISoundModule.cs
@@ -108,7 +108,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name="radius"></param>
         /// <param name="useMaster"></param>
         /// <param name="isMaster"></param>
-        void SendSound(UUID objectID, string sound, double volume,
+        void SendSound(UUID objectID, UUID sound, double volume,
                 bool triggered, byte flags, float radius, bool useMaster,
                 bool isMaster);
     }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index cbb92b2..f79ac96 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2243,7 +2243,7 @@ namespace OpenSim.Region.Framework.Scenes
                 ISoundModule soundModule = ParentGroup.Scene.RequestModuleInterface<ISoundModule>();
                 if (soundModule != null)
                 {
-                    soundModule.SendSound(UUID, CollisionSound.ToString(),
+                    soundModule.SendSound(UUID, CollisionSound,
                             CollisionSoundVolume, true, (byte)0, 0, false,
                             false);
                 }