diff options
author | SignpostMarv | 2012-10-05 14:39:23 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-10-29 23:38:58 +0000 |
commit | 1c618843b836c4e9ad8ae685d2f49836e32d8b08 (patch) | |
tree | d38063f41cea67bc9460efb19ba115575bb6b07d /OpenSim/Region | |
parent | SceneObjectPart.SendSound can exit early if a sound module was not found. (diff) | |
download | opensim-SC_OLD-1c618843b836c4e9ad8ae685d2f49836e32d8b08.zip opensim-SC_OLD-1c618843b836c4e9ad8ae685d2f49836e32d8b08.tar.gz opensim-SC_OLD-1c618843b836c4e9ad8ae685d2f49836e32d8b08.tar.bz2 opensim-SC_OLD-1c618843b836c4e9ad8ae685d2f49836e32d8b08.tar.xz |
formatting changes to SceneObjectPart.SendSound; consistent indentation
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 3a39da0..b333a1a 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -2717,51 +2717,51 @@ namespace OpenSim.Region.Framework.Scenes | |||
2717 | if (soundID == UUID.Zero) | 2717 | if (soundID == UUID.Zero) |
2718 | return; | 2718 | return; |
2719 | 2719 | ||
2720 | if (useMaster) | 2720 | if (useMaster) |
2721 | { | ||
2722 | if (isMaster) | ||
2721 | { | 2723 | { |
2722 | if (isMaster) | 2724 | if (triggered) |
2725 | soundModule.TriggerSound(soundID, ownerID, objectID, parentID, volume, position, regionHandle, radius); | ||
2726 | else | ||
2727 | soundModule.PlayAttachedSound(soundID, ownerID, objectID, volume, position, flags, radius); | ||
2728 | ParentGroup.PlaySoundMasterPrim = this; | ||
2729 | ownerID = OwnerID; | ||
2730 | objectID = ParentGroup.RootPart.UUID; | ||
2731 | parentID = ParentGroup.UUID; | ||
2732 | position = AbsolutePosition; // region local | ||
2733 | regionHandle = ParentGroup.Scene.RegionInfo.RegionHandle; | ||
2734 | if (triggered) | ||
2735 | soundModule.TriggerSound(soundID, ownerID, objectID, parentID, volume, position, regionHandle, radius); | ||
2736 | else | ||
2737 | soundModule.PlayAttachedSound(soundID, ownerID, objectID, volume, position, flags, radius); | ||
2738 | foreach (SceneObjectPart prim in ParentGroup.PlaySoundSlavePrims) | ||
2723 | { | 2739 | { |
2740 | ownerID = prim.OwnerID; | ||
2741 | objectID = prim.ParentGroup.RootPart.UUID; | ||
2742 | parentID = prim.ParentGroup.UUID; | ||
2743 | position = prim.AbsolutePosition; // region local | ||
2744 | regionHandle = prim.ParentGroup.Scene.RegionInfo.RegionHandle; | ||
2724 | if (triggered) | 2745 | if (triggered) |
2725 | soundModule.TriggerSound(soundID, ownerID, objectID, parentID, volume, position, regionHandle, radius); | 2746 | soundModule.TriggerSound(soundID, ownerID, objectID, parentID, volume, position, regionHandle, radius); |
2726 | else | 2747 | else |
2727 | soundModule.PlayAttachedSound(soundID, ownerID, objectID, volume, position, flags, radius); | 2748 | soundModule.PlayAttachedSound(soundID, ownerID, objectID, volume, position, flags, radius); |
2728 | ParentGroup.PlaySoundMasterPrim = this; | ||
2729 | ownerID = OwnerID; | ||
2730 | objectID = ParentGroup.RootPart.UUID; | ||
2731 | parentID = ParentGroup.UUID; | ||
2732 | position = AbsolutePosition; // region local | ||
2733 | regionHandle = ParentGroup.Scene.RegionInfo.RegionHandle; | ||
2734 | if (triggered) | ||
2735 | soundModule.TriggerSound(soundID, ownerID, objectID, parentID, volume, position, regionHandle, radius); | ||
2736 | else | ||
2737 | soundModule.PlayAttachedSound(soundID, ownerID, objectID, volume, position, flags, radius); | ||
2738 | foreach (SceneObjectPart prim in ParentGroup.PlaySoundSlavePrims) | ||
2739 | { | ||
2740 | ownerID = prim.OwnerID; | ||
2741 | objectID = prim.ParentGroup.RootPart.UUID; | ||
2742 | parentID = prim.ParentGroup.UUID; | ||
2743 | position = prim.AbsolutePosition; // region local | ||
2744 | regionHandle = prim.ParentGroup.Scene.RegionInfo.RegionHandle; | ||
2745 | if (triggered) | ||
2746 | soundModule.TriggerSound(soundID, ownerID, objectID, parentID, volume, position, regionHandle, radius); | ||
2747 | else | ||
2748 | soundModule.PlayAttachedSound(soundID, ownerID, objectID, volume, position, flags, radius); | ||
2749 | } | ||
2750 | ParentGroup.PlaySoundSlavePrims.Clear(); | ||
2751 | ParentGroup.PlaySoundMasterPrim = null; | ||
2752 | } | ||
2753 | else | ||
2754 | { | ||
2755 | ParentGroup.PlaySoundSlavePrims.Add(this); | ||
2756 | } | 2749 | } |
2750 | ParentGroup.PlaySoundSlavePrims.Clear(); | ||
2751 | ParentGroup.PlaySoundMasterPrim = null; | ||
2757 | } | 2752 | } |
2758 | else | 2753 | else |
2759 | { | 2754 | { |
2760 | if (triggered) | 2755 | ParentGroup.PlaySoundSlavePrims.Add(this); |
2761 | soundModule.TriggerSound(soundID, ownerID, objectID, parentID, volume, position, regionHandle, radius); | ||
2762 | else | ||
2763 | soundModule.PlayAttachedSound(soundID, ownerID, objectID, volume, position, flags, radius); | ||
2764 | } | 2756 | } |
2757 | } | ||
2758 | else | ||
2759 | { | ||
2760 | if (triggered) | ||
2761 | soundModule.TriggerSound(soundID, ownerID, objectID, parentID, volume, position, regionHandle, radius); | ||
2762 | else | ||
2763 | soundModule.PlayAttachedSound(soundID, ownerID, objectID, volume, position, flags, radius); | ||
2764 | } | ||
2765 | } | 2765 | } |
2766 | 2766 | ||
2767 | /// <summary> | 2767 | /// <summary> |