diff options
| author | SignpostMarv | 2012-10-05 14:37:01 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-10-29 23:38:57 +0000 |
| commit | b42cfe49a2f4e95687eb76381ed911515ef2e3b2 (patch) | |
| tree | 84ea1e528dbcb0734c36ffdc05d77a948404f2ad /OpenSim | |
| parent | TryGetScenePresence in TriggerSound is probably meant to be using the ownerID... (diff) | |
| download | opensim-SC-b42cfe49a2f4e95687eb76381ed911515ef2e3b2.zip opensim-SC-b42cfe49a2f4e95687eb76381ed911515ef2e3b2.tar.gz opensim-SC-b42cfe49a2f4e95687eb76381ed911515ef2e3b2.tar.bz2 opensim-SC-b42cfe49a2f4e95687eb76381ed911515ef2e3b2.tar.xz | |
Replacing double-if block in SceneObjectPart.SendSound with Util.Clip
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 27ef4c9..a539eff 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -2684,10 +2684,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2684 | /// <param name="flags"></param> | 2684 | /// <param name="flags"></param> |
| 2685 | public void SendSound(string sound, double volume, bool triggered, byte flags, float radius, bool useMaster, bool isMaster) | 2685 | public void SendSound(string sound, double volume, bool triggered, byte flags, float radius, bool useMaster, bool isMaster) |
| 2686 | { | 2686 | { |
| 2687 | if (volume > 1) | 2687 | volume = Util.Clip((float)volume, 0, 1); |
| 2688 | volume = 1; | ||
| 2689 | if (volume < 0) | ||
| 2690 | volume = 0; | ||
| 2691 | 2688 | ||
| 2692 | UUID ownerID = OwnerID; | 2689 | UUID ownerID = OwnerID; |
| 2693 | UUID objectID = ParentGroup.RootPart.UUID; | 2690 | UUID objectID = ParentGroup.RootPart.UUID; |