aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorSignpostMarv2012-10-16 12:44:09 +0100
committerJustin Clark-Casey (justincc)2012-10-29 23:39:00 +0000
commitc796f7861e318cc12248f3a86ee5b29e3fa99d79 (patch)
tree0472c6a5123199db2bf7a8a13cb9ae36853a4053 /OpenSim
parentshuffling code around so that the interface for ISoundModule.SendSound() spec... (diff)
downloadopensim-SC-c796f7861e318cc12248f3a86ee5b29e3fa99d79.zip
opensim-SC-c796f7861e318cc12248f3a86ee5b29e3fa99d79.tar.gz
opensim-SC-c796f7861e318cc12248f3a86ee5b29e3fa99d79.tar.bz2
opensim-SC-c796f7861e318cc12248f3a86ee5b29e3fa99d79.tar.xz
80-character width terminal formatting of recent commits to llPlaySound, llPlaySoundSlave, llTriggerSound and llTriggerSoundLimited
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs22
1 files changed, 15 insertions, 7 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 869d94e..610cb14 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2405,7 +2405,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2405 // send the sound, once, to all clients in range 2405 // send the sound, once, to all clients in range
2406 if (m_SoundModule != null) 2406 if (m_SoundModule != null)
2407 { 2407 {
2408 m_SoundModule.SendSound(m_host.UUID, KeyOrName(sound, AssetType.Sound), volume, false, 0, 0, false, false); 2408 m_SoundModule.SendSound(m_host.UUID,
2409 KeyOrName(sound, AssetType.Sound), volume, false, 0,
2410 0, false, false);
2409 } 2411 }
2410 } 2412 }
2411 2413
@@ -2445,7 +2447,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2445 // send the sound, once, to all clients in range 2447 // send the sound, once, to all clients in range
2446 if (m_SoundModule != null) 2448 if (m_SoundModule != null)
2447 { 2449 {
2448 m_SoundModule.SendSound(m_host.UUID, KeyOrName(sound, AssetType.Sound), volume, false, 0, 0, true, false); 2450 m_SoundModule.SendSound(m_host.UUID,
2451 KeyOrName(sound, AssetType.Sound), volume, false, 0,
2452 0, true, false);
2449 } 2453 }
2450 } 2454 }
2451 2455
@@ -2455,7 +2459,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2455 // send the sound, once, to all clients in rangeTrigger or play an attached sound in this part's inventory. 2459 // send the sound, once, to all clients in rangeTrigger or play an attached sound in this part's inventory.
2456 if (m_SoundModule != null) 2460 if (m_SoundModule != null)
2457 { 2461 {
2458 m_SoundModule.SendSound(m_host.UUID, KeyOrName(sound, AssetType.Sound), volume, true, 0, 0, false, false); 2462 m_SoundModule.SendSound(m_host.UUID,
2463 KeyOrName(sound, AssetType.Sound), volume, true, 0, 0,
2464 false, false);
2459 } 2465 }
2460 } 2466 }
2461 2467
@@ -5871,10 +5877,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5871 m_host.AddScriptLPS(1); 5877 m_host.AddScriptLPS(1);
5872 if (m_SoundModule != null) 5878 if (m_SoundModule != null)
5873 { 5879 {
5874 float radius1 = (float)llVecDist(llGetPos(), top_north_east); 5880 float radius1 = (float)llVecDist(llGetPos(), top_north_east);
5875 float radius2 = (float)llVecDist(llGetPos(), bottom_south_west); 5881 float radius2 = (float)llVecDist(llGetPos(), bottom_south_west);
5876 float radius = Math.Abs(radius1 - radius2); 5882 float radius = Math.Abs(radius1 - radius2);
5877 m_SoundModule.SendSound(m_host.UUID, KeyOrName(sound, AssetType.Sound), volume, true, 0, radius, false, false); 5883 m_SoundModule.SendSound(m_host.UUID,
5884 KeyOrName(sound, AssetType.Sound), volume, true, 0,
5885 radius, false, false);
5878 } 5886 }
5879 } 5887 }
5880 5888