diff options
author | SignpostMarv | 2012-10-16 12:40:21 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-10-29 23:39:00 +0000 |
commit | c5af16aef82e2bdf2f4d877a231180e00a8893a6 (patch) | |
tree | 3be95d8dea8bfcc764eb0cd374ecd88aed2a7ea6 /OpenSim/Region/Framework | |
parent | moving SendSound from SceneObjectPart to ISoundModule (diff) | |
download | opensim-SC_OLD-c5af16aef82e2bdf2f4d877a231180e00a8893a6.zip opensim-SC_OLD-c5af16aef82e2bdf2f4d877a231180e00a8893a6.tar.gz opensim-SC_OLD-c5af16aef82e2bdf2f4d877a231180e00a8893a6.tar.bz2 opensim-SC_OLD-c5af16aef82e2bdf2f4d877a231180e00a8893a6.tar.xz |
shuffling code around so that the interface for ISoundModule.SendSound() specifies a UUID rather than a string
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/ISoundModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/ISoundModule.cs b/OpenSim/Region/Framework/Interfaces/ISoundModule.cs index c5edcb0..5d1bb63 100644 --- a/OpenSim/Region/Framework/Interfaces/ISoundModule.cs +++ b/OpenSim/Region/Framework/Interfaces/ISoundModule.cs | |||
@@ -108,7 +108,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
108 | /// <param name="radius"></param> | 108 | /// <param name="radius"></param> |
109 | /// <param name="useMaster"></param> | 109 | /// <param name="useMaster"></param> |
110 | /// <param name="isMaster"></param> | 110 | /// <param name="isMaster"></param> |
111 | void SendSound(UUID objectID, string sound, double volume, | 111 | void SendSound(UUID objectID, UUID sound, double volume, |
112 | bool triggered, byte flags, float radius, bool useMaster, | 112 | bool triggered, byte flags, float radius, bool useMaster, |
113 | bool isMaster); | 113 | bool isMaster); |
114 | } | 114 | } |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index cbb92b2..f79ac96 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -2243,7 +2243,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2243 | ISoundModule soundModule = ParentGroup.Scene.RequestModuleInterface<ISoundModule>(); | 2243 | ISoundModule soundModule = ParentGroup.Scene.RequestModuleInterface<ISoundModule>(); |
2244 | if (soundModule != null) | 2244 | if (soundModule != null) |
2245 | { | 2245 | { |
2246 | soundModule.SendSound(UUID, CollisionSound.ToString(), | 2246 | soundModule.SendSound(UUID, CollisionSound, |
2247 | CollisionSoundVolume, true, (byte)0, 0, false, | 2247 | CollisionSoundVolume, true, (byte)0, 0, false, |
2248 | false); | 2248 | false); |
2249 | } | 2249 | } |