Merge branch 'avination' into careminster

Conflicts:
	OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs
	OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
	OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs

1 files changed, 4 insertions, 2 deletions

diff --git a/OpenSim/Region/Framework/Scenes/CollisionSounds.cs b/OpenSim/Region/Framework/Scenes/CollisionSounds.cs
index a95e75a..075724e 100644
--- a/OpenSim/Region/Framework/Scenes/CollisionSounds.cs
+++ b/OpenSim/Region/Framework/Scenes/CollisionSounds.cs
@@ -266,9 +266,11 @@ namespace OpenSim.Region.Framework.Scenes
                     else
                     {
                         volume = Math.Abs(colInfo.relativeVel);
-                        if (volume < 0.2f)
+                        // Most noral collisions (running into walls, stairs)
+                        // should never be heard.
+                        if (volume < 3.2f)
                             continue;
-                        m_log.DebugFormat("Collision speed was {0}", volume);
+//                        m_log.DebugFormat("Collision speed was {0}", volume);
 
                         // Cap to 0.2 times volume because climbing stairs should not be noisy
                         // Also changed scaling