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/Framework/Scenes/SceneObjectPart.cs | |
| 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/Framework/Scenes/SceneObjectPart.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 9e644aa..2b5a6f9 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -231,6 +231,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 231 | 231 | ||
| 232 | public double SoundRadius; | 232 | public double SoundRadius; |
| 233 | 233 | ||
| 234 | /// <summary> | ||
| 235 | /// Should sounds played from this prim be queued? | ||
| 236 | /// </summary> | ||
| 237 | /// <remarks> | ||
| 238 | /// This should only be changed by sound modules. It is up to sound modules as to how they interpret this setting. | ||
| 239 | /// </remarks> | ||
| 240 | public bool SoundQueueing { get; set; } | ||
| 234 | 241 | ||
| 235 | public uint TimeStampFull; | 242 | public uint TimeStampFull; |
| 236 | 243 | ||