aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorSignpostMarv2012-10-06 22:27:20 +0100
committerJustin Clark-Casey (justincc)2012-10-29 23:38:59 +0000
commitd7ffcace8f596d9b0cf84f1e8cbe4e2d6a71baef (patch)
tree4a1b8d67ce3598e6874826cc1fb8bed30c80d128
parenttransposing LoopSoundMaster to Sound Module (diff)
downloadopensim-SC_OLD-d7ffcace8f596d9b0cf84f1e8cbe4e2d6a71baef.zip
opensim-SC_OLD-d7ffcace8f596d9b0cf84f1e8cbe4e2d6a71baef.tar.gz
opensim-SC_OLD-d7ffcace8f596d9b0cf84f1e8cbe4e2d6a71baef.tar.bz2
opensim-SC_OLD-d7ffcace8f596d9b0cf84f1e8cbe4e2d6a71baef.tar.xz
adjusting parameter order of PreloadSound to be more logical
-rw-r--r--OpenSim/Region/CoreModules/World/Sound/SoundModuleNonShared.cs2
-rw-r--r--OpenSim/Region/Framework/Interfaces/ISoundModule.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
3 files changed, 4 insertions, 4 deletions
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
224 } 224 }
225 } 225 }
226 226
227 public virtual void PreloadSound(UUID soundID, UUID objectID, float radius) 227 public virtual void PreloadSound(UUID objectID, UUID soundID, float radius)
228 { 228 {
229 SceneObjectPart part; 229 SceneObjectPart part;
230 if (soundID == UUID.Zero 230 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
78 /// <summary> 78 /// <summary>
79 /// Preload sound to viewers within range. 79 /// Preload sound to viewers within range.
80 /// </summary> 80 /// </summary>
81 /// <param name="soundID">Sound asset ID</param>
82 /// <param name="objectID">Sound source ID</param> 81 /// <param name="objectID">Sound source ID</param>
82 /// <param name="soundID">Sound asset ID</param>
83 /// <param name="radius"> 83 /// <param name="radius">
84 /// Radius used to determine which viewers should preload the sound. 84 /// Radius used to determine which viewers should preload the sound.
85 /// </param> 85 /// </param>
86 void PreloadSound(UUID soundID, UUID objectID, float radius); 86 void PreloadSound(UUID objectID, UUID soundID, float radius);
87 87
88 /// <summary> 88 /// <summary>
89 /// Declare object as new sync master, play specified sound at 89 /// 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
2440 { 2440 {
2441 m_host.AddScriptLPS(1); 2441 m_host.AddScriptLPS(1);
2442 if (m_SoundModule != null) 2442 if (m_SoundModule != null)
2443 m_SoundModule.PreloadSound(KeyOrName(sound), m_host.UUID, 0); 2443 m_SoundModule.PreloadSound(m_host.UUID, KeyOrName(sound), 0);
2444 ScriptSleep(1000); 2444 ScriptSleep(1000);
2445 } 2445 }
2446 2446