From d7ffcace8f596d9b0cf84f1e8cbe4e2d6a71baef Mon Sep 17 00:00:00 2001
From: SignpostMarv
Date: Sat, 6 Oct 2012 22:27:20 +0100
Subject: adjusting parameter order of PreloadSound to be more logical

---
 OpenSim/Region/CoreModules/World/Sound/SoundModuleNonShared.cs   | 2 +-
 OpenSim/Region/Framework/Interfaces/ISoundModule.cs              | 4 ++--
 OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/CoreModules/World/Sound/SoundModuleNonShared.cs b/OpenSim/Region/CoreModules/World/Sound/SoundModuleNonShared.cs
index 4912ed8..5a560d8 100644
--- a/OpenSim/Region/CoreModules/World/Sound/SoundModuleNonShared.cs
+++ b/OpenSim/Region/CoreModules/World/Sound/SoundModuleNonShared.cs
@@ -224,7 +224,7 @@ namespace OpenSim.Region.CoreModules.World.Sound
             }
         }
 
-        public virtual void PreloadSound(UUID soundID, UUID objectID, float radius)
+        public virtual void PreloadSound(UUID objectID, UUID soundID, float radius)
         {
             SceneObjectPart part;
             if (soundID == UUID.Zero
diff --git a/OpenSim/Region/Framework/Interfaces/ISoundModule.cs b/OpenSim/Region/Framework/Interfaces/ISoundModule.cs
index d2557b5..d34a520 100644
--- a/OpenSim/Region/Framework/Interfaces/ISoundModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/ISoundModule.cs
@@ -78,12 +78,12 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <summary>
         /// Preload sound to viewers within range.
         /// </summary>
-        /// <param name="soundID">Sound asset ID</param>
         /// <param name="objectID">Sound source ID</param>
+        /// <param name="soundID">Sound asset ID</param>
         /// <param name="radius">
         /// Radius used to determine which viewers should preload the sound.
         /// </param>
-        void PreloadSound(UUID soundID, UUID objectID, float radius);
+        void PreloadSound(UUID objectID, UUID soundID, float radius);
 
         /// <summary>
         /// Declare object as new sync master, play specified sound at
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 2669add..0252145 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2440,7 +2440,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
             if (m_SoundModule != null)
-                m_SoundModule.PreloadSound(KeyOrName(sound), m_host.UUID, 0);
+                m_SoundModule.PreloadSound(m_host.UUID, KeyOrName(sound), 0);
             ScriptSleep(1000);
         }
 
-- 
cgit v1.1