aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorUbitUmarov2012-05-28 13:10:02 +0100
committerUbitUmarov2012-05-28 13:10:02 +0100
commit121433d03aad53bfa8d50854115c0496317b00eb (patch)
tree4da6404a38c8f82a7078214575b284ab414f7970 /OpenSim/Region
parentrevert making sculpts phanton if sculpt meshing option is off (diff)
downloadopensim-SC_OLD-121433d03aad53bfa8d50854115c0496317b00eb.zip
opensim-SC_OLD-121433d03aad53bfa8d50854115c0496317b00eb.tar.gz
opensim-SC_OLD-121433d03aad53bfa8d50854115c0496317b00eb.tar.bz2
opensim-SC_OLD-121433d03aad53bfa8d50854115c0496317b00eb.tar.xz
disable collision sounds for now
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/CollisionSounds.cs10
1 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/CollisionSounds.cs b/OpenSim/Region/Framework/Scenes/CollisionSounds.cs
index 81ca9f1..de82ddc 100644
--- a/OpenSim/Region/Framework/Scenes/CollisionSounds.cs
+++ b/OpenSim/Region/Framework/Scenes/CollisionSounds.cs
@@ -188,6 +188,9 @@ namespace OpenSim.Region.Framework.Scenes
188 188
189 public static void PartCollisionSound(SceneObjectPart part, List<CollisionForSoundInfo> collidersinfolist) 189 public static void PartCollisionSound(SceneObjectPart part, List<CollisionForSoundInfo> collidersinfolist)
190 { 190 {
191 // disable for now
192 return;
193
191 if (collidersinfolist.Count == 0 || part == null) 194 if (collidersinfolist.Count == 0 || part == null)
192 return; 195 return;
193 196
@@ -296,7 +299,10 @@ namespace OpenSim.Region.Framework.Scenes
296 } 299 }
297 300
298 public static void AvatarCollisionSound(ScenePresence av, List<CollisionForSoundInfo> collidersinfolist) 301 public static void AvatarCollisionSound(ScenePresence av, List<CollisionForSoundInfo> collidersinfolist)
299 { 302 {
303 // disable for now
304 return;
305
300 if (collidersinfolist.Count == 0 || av == null) 306 if (collidersinfolist.Count == 0 || av == null)
301 return; 307 return;
302 308
@@ -368,4 +374,4 @@ namespace OpenSim.Region.Framework.Scenes
368 } 374 }
369 } 375 }
370 } 376 }
371} 377} \ No newline at end of file