diff options
author | Melanie | 2013-05-24 00:45:08 +0100 |
---|---|---|
committer | Melanie | 2013-05-24 00:45:08 +0100 |
commit | 09c2cd0d76e62cbc7bb2d8b0f21caae901af1681 (patch) | |
tree | 1856552dd68bfa23877f28842cb00e9e0089d1c4 /OpenSim/Region/CoreModules/World | |
parent | Merge branch 'master' into careminster (diff) | |
parent | BulletSim: specify directory for OpenSim.Region.Physics.Meshing (diff) | |
download | opensim-SC_OLD-09c2cd0d76e62cbc7bb2d8b0f21caae901af1681.zip opensim-SC_OLD-09c2cd0d76e62cbc7bb2d8b0f21caae901af1681.tar.gz opensim-SC_OLD-09c2cd0d76e62cbc7bb2d8b0f21caae901af1681.tar.bz2 opensim-SC_OLD-09c2cd0d76e62cbc7bb2d8b0f21caae901af1681.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Sound/SoundModule.cs | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs index 883045a..d093224 100644 --- a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs +++ b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs | |||
@@ -369,6 +369,15 @@ namespace OpenSim.Region.CoreModules.World.Sound | |||
369 | }); | 369 | }); |
370 | } | 370 | } |
371 | 371 | ||
372 | public void SetSoundQueueing(UUID objectID, bool shouldQueue) | ||
373 | { | ||
374 | SceneObjectPart part; | ||
375 | if (!m_scene.TryGetSceneObjectPart(objectID, out part)) | ||
376 | return; | ||
377 | |||
378 | part.SoundQueueing = shouldQueue; | ||
379 | } | ||
380 | |||
372 | #endregion | 381 | #endregion |
373 | } | 382 | } |
374 | } | 383 | } |