aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Interfaces/ISoundModule.cs16
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs2
2 files changed, 6 insertions, 12 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/ISoundModule.cs b/OpenSim/Region/Framework/Interfaces/ISoundModule.cs
index f7c6513..aaa9931 100644
--- a/OpenSim/Region/Framework/Interfaces/ISoundModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/ISoundModule.cs
@@ -46,11 +46,9 @@ namespace OpenSim.Region.Framework.Interfaces
46 /// <param name="gain">Sound volume</param> 46 /// <param name="gain">Sound volume</param>
47 /// <param name="position">Sound source position</param> 47 /// <param name="position">Sound source position</param>
48 /// <param name="flags">Sound flags</param> 48 /// <param name="flags">Sound flags</param>
49 /// <param name="radius">
50 /// Radius used to affect gain over distance.
51 /// </param> 49 /// </param>
52 void PlayAttachedSound(UUID soundID, UUID ownerID, UUID objectID, 50 void PlayAttachedSound(UUID soundID, UUID ownerID, UUID objectID,
53 double gain, Vector3 position, byte flags, float radius); 51 double gain, Vector3 position, byte flags);
54 52
55 /// <summary> 53 /// <summary>
56 /// Trigger a sound in the scene. 54 /// Trigger a sound in the scene.
@@ -67,7 +65,7 @@ namespace OpenSim.Region.Framework.Interfaces
67 /// </param> 65 /// </param>
68 void TriggerSound( 66 void TriggerSound(
69 UUID soundId, UUID ownerID, UUID objectID, UUID parentID, 67 UUID soundId, UUID ownerID, UUID objectID, UUID parentID,
70 double gain, Vector3 position, UInt64 handle, float radius); 68 double gain, Vector3 position, UInt64 handle);
71 69
72 /// <summary> 70 /// <summary>
73 /// Stop sounds eminating from an object. 71 /// Stop sounds eminating from an object.
@@ -80,10 +78,8 @@ namespace OpenSim.Region.Framework.Interfaces
80 /// </summary> 78 /// </summary>
81 /// <param name="objectID">Sound source ID</param> 79 /// <param name="objectID">Sound source ID</param>
82 /// <param name="soundID">Sound asset ID</param> 80 /// <param name="soundID">Sound asset ID</param>
83 /// <param name="radius">
84 /// Radius used to determine which viewers should preload the sound.
85 /// </param> 81 /// </param>
86 void PreloadSound(UUID objectID, UUID soundID, float radius); 82 void PreloadSound(UUID objectID, UUID soundID);
87 83
88 /// <summary> 84 /// <summary>
89 /// Loop specified sound at specified volume with specified radius, 85 /// Loop specified sound at specified volume with specified radius,
@@ -92,10 +88,9 @@ namespace OpenSim.Region.Framework.Interfaces
92 /// <param name="objectID">Sound source ID</param> 88 /// <param name="objectID">Sound source ID</param>
93 /// <param name="soundID">Sound asset ID</param> 89 /// <param name="soundID">Sound asset ID</param>
94 /// <param name="gain">Sound volume</param> 90 /// <param name="gain">Sound volume</param>
95 /// <param name="radius">Sound radius</param>
96 /// <param name="isMaster">Set object to sync master if true</param> 91 /// <param name="isMaster">Set object to sync master if true</param>
97 void LoopSound(UUID objectID, UUID soundID, double gain, 92 void LoopSound(UUID objectID, UUID soundID, double gain,
98 double radius, bool isMaster, bool isSlave); 93 bool isMaster, bool isSlave);
99 94
100 /// <summary> 95 /// <summary>
101 /// Trigger or play an attached sound in this part's inventory. 96 /// Trigger or play an attached sound in this part's inventory.
@@ -104,11 +99,10 @@ namespace OpenSim.Region.Framework.Interfaces
104 /// <param name="sound">Sound asset ID</param> 99 /// <param name="sound">Sound asset ID</param>
105 /// <param name="volume">Sound volume</param> 100 /// <param name="volume">Sound volume</param>
106 /// <param name="triggered">Triggered or not.</param> 101 /// <param name="triggered">Triggered or not.</param>
107 /// <param name="radius">Sound radius</param>
108 /// <param name="useMaster">Play using sound master</param> 102 /// <param name="useMaster">Play using sound master</param>
109 /// <param name="isMaster">Play as sound master</param> 103 /// <param name="isMaster">Play as sound master</param>
110 void SendSound(UUID objectID, UUID sound, double volume, 104 void SendSound(UUID objectID, UUID sound, double volume,
111 bool triggered, byte flags, float radius, bool useMaster, 105 bool triggered, byte flags, bool useMaster,
112 bool isMaster); 106 bool isMaster);
113 107
114 /// <summary> 108 /// <summary>
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 2c183ad..2177acd 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -3077,7 +3077,7 @@ namespace OpenSim.Region.Framework.Scenes
3077 UUID parentID = ParentGroup.UUID; 3077 UUID parentID = ParentGroup.UUID;
3078 ulong regionHandle = ParentGroup.Scene.RegionInfo.RegionHandle; 3078 ulong regionHandle = ParentGroup.Scene.RegionInfo.RegionHandle;
3079 3079
3080 soundModule.TriggerSound(soundID, ownerID, objectID, parentID, volume, position, regionHandle, 0 ); 3080 soundModule.TriggerSound(soundID, ownerID, objectID, parentID, volume, position, regionHandle);
3081 } 3081 }
3082 3082
3083 public void PhysicsOutOfBounds(Vector3 pos) 3083 public void PhysicsOutOfBounds(Vector3 pos)