diff options
author | Melanie | 2012-05-17 21:36:27 +0200 |
---|---|---|
committer | Melanie | 2012-05-17 21:36:27 +0200 |
commit | 511fc663a24db9d042d0c5a97820870bbff6c085 (patch) | |
tree | 05fefffda44798910406681ba85936d52eadbb05 /OpenSim/Region/Framework/Scenes | |
parent | udp transfer: make number packets estimation coerent with number actually sen... (diff) | |
download | opensim-SC-511fc663a24db9d042d0c5a97820870bbff6c085.zip opensim-SC-511fc663a24db9d042d0c5a97820870bbff6c085.tar.gz opensim-SC-511fc663a24db9d042d0c5a97820870bbff6c085.tar.bz2 opensim-SC-511fc663a24db9d042d0c5a97820870bbff6c085.tar.xz |
Temprorarily disable collision sounds until we have some sound bites
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/CollisionSounds.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/CollisionSounds.cs b/OpenSim/Region/Framework/Scenes/CollisionSounds.cs index 5d43027..130eb20 100644 --- a/OpenSim/Region/Framework/Scenes/CollisionSounds.cs +++ b/OpenSim/Region/Framework/Scenes/CollisionSounds.cs | |||
@@ -127,6 +127,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
127 | 127 | ||
128 | public static void PartCollisionSound(SceneObjectPart part,List<uint> Colliders) | 128 | public static void PartCollisionSound(SceneObjectPart part,List<uint> Colliders) |
129 | { | 129 | { |
130 | return; | ||
131 | |||
130 | if(Colliders.Count == 0 || part == null) | 132 | if(Colliders.Count == 0 || part == null) |
131 | return; | 133 | return; |
132 | 134 | ||
@@ -214,6 +216,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
214 | 216 | ||
215 | public static void AvatarCollisionSound(ScenePresence av, List<uint> Colliders) | 217 | public static void AvatarCollisionSound(ScenePresence av, List<uint> Colliders) |
216 | { | 218 | { |
219 | return; | ||
220 | |||
217 | if (Colliders.Count == 0 || av == null) | 221 | if (Colliders.Count == 0 || av == null) |
218 | return; | 222 | return; |
219 | 223 | ||
@@ -268,4 +272,4 @@ namespace OpenSim.Region.Framework.Scenes | |||
268 | } | 272 | } |
269 | 273 | ||
270 | } | 274 | } |
271 | } \ No newline at end of file | 275 | } |