diff options
author | Justin Clark-Casey (justincc) | 2013-05-22 20:01:57 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-05-22 20:01:57 +0100 |
commit | 7d38f4940c39b217bcf6b90b7811933099916de9 (patch) | |
tree | 75c5a6ef2b670e464cec98d94580f06fd86c38c2 /OpenSim/Region/Framework | |
parent | Revert "BulletSim: add code to experimentally use asset hull data." (diff) | |
download | opensim-SC_OLD-7d38f4940c39b217bcf6b90b7811933099916de9.zip opensim-SC_OLD-7d38f4940c39b217bcf6b90b7811933099916de9.tar.gz opensim-SC_OLD-7d38f4940c39b217bcf6b90b7811933099916de9.tar.bz2 opensim-SC_OLD-7d38f4940c39b217bcf6b90b7811933099916de9.tar.xz |
Implement llSetSoundQueueing().
This is controlled by the viewer, not the server.
So as per http://wiki.secondlife.com/wiki/LlSetSoundQueueing, only two sounds can be queued per prim.
You probably need to use llPreloadSound() for best results
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/ISoundModule.cs | 8 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 10 |
2 files changed, 16 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/ISoundModule.cs b/OpenSim/Region/Framework/Interfaces/ISoundModule.cs index 68af492..8372ddd 100644 --- a/OpenSim/Region/Framework/Interfaces/ISoundModule.cs +++ b/OpenSim/Region/Framework/Interfaces/ISoundModule.cs | |||
@@ -104,7 +104,6 @@ namespace OpenSim.Region.Framework.Interfaces | |||
104 | /// <param name="sound">Sound asset ID</param> | 104 | /// <param name="sound">Sound asset ID</param> |
105 | /// <param name="volume">Sound volume</param> | 105 | /// <param name="volume">Sound volume</param> |
106 | /// <param name="triggered">Triggered or not.</param> | 106 | /// <param name="triggered">Triggered or not.</param> |
107 | /// <param name="flags"></param> | ||
108 | /// <param name="radius">Sound radius</param> | 107 | /// <param name="radius">Sound radius</param> |
109 | /// <param name="useMaster">Play using sound master</param> | 108 | /// <param name="useMaster">Play using sound master</param> |
110 | /// <param name="isMaster">Play as sound master</param> | 109 | /// <param name="isMaster">Play as sound master</param> |
@@ -123,5 +122,12 @@ namespace OpenSim.Region.Framework.Interfaces | |||
123 | /// <param name="max">AABB top north-east corner</param> | 122 | /// <param name="max">AABB top north-east corner</param> |
124 | void TriggerSoundLimited(UUID objectID, UUID sound, double volume, | 123 | void TriggerSoundLimited(UUID objectID, UUID sound, double volume, |
125 | Vector3 min, Vector3 max); | 124 | Vector3 min, Vector3 max); |
125 | |||
126 | /// <summary> | ||
127 | /// Set whether sounds on the given prim should be queued. | ||
128 | /// </summary> | ||
129 | /// <param name='objectID'></param> | ||
130 | /// <param name='shouldQueue'></param> | ||
131 | void SetSoundQueueing(UUID objectID, bool shouldQueue); | ||
126 | } | 132 | } |
127 | } \ No newline at end of file | 133 | } \ No newline at end of file |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 347a2b5..b1c1cbb 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -219,6 +219,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
219 | 219 | ||
220 | public double SoundRadius; | 220 | public double SoundRadius; |
221 | 221 | ||
222 | /// <summary> | ||
223 | /// Should sounds played from this prim be queued? | ||
224 | /// </summary> | ||
225 | /// <remarks> | ||
226 | /// This should only be changed by sound modules. It is up to sound modules as to how they interpret this setting. | ||
227 | /// </remarks> | ||
228 | public bool SoundQueueing { get; set; } | ||
229 | |||
222 | public uint TimeStampFull; | 230 | public uint TimeStampFull; |
223 | 231 | ||
224 | public uint TimeStampLastActivity; // Will be used for AutoReturn | 232 | public uint TimeStampLastActivity; // Will be used for AutoReturn |
@@ -2429,7 +2437,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2429 | if (soundModule != null) | 2437 | if (soundModule != null) |
2430 | { | 2438 | { |
2431 | soundModule.SendSound(UUID, CollisionSound, | 2439 | soundModule.SendSound(UUID, CollisionSound, |
2432 | CollisionSoundVolume, true, (byte)0, 0, false, | 2440 | CollisionSoundVolume, true, 0, 0, false, |
2433 | false); | 2441 | false); |
2434 | } | 2442 | } |
2435 | } | 2443 | } |