aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
authorubit2012-05-17 05:16:51 +0200
committerubit2012-05-17 05:16:51 +0200
commit8411d7f356d07c7d5f3c1c41ac7412266f8ec314 (patch)
tree23f505e51ece853d6cd6440f35feef42dd6d8c37 /OpenSim/Region/Framework/Scenes/ScenePresence.cs
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parent add avatar colision sounds. Changed test sound UUID (diff)
downloadopensim-SC_OLD-8411d7f356d07c7d5f3c1c41ac7412266f8ec314.zip
opensim-SC_OLD-8411d7f356d07c7d5f3c1c41ac7412266f8ec314.tar.gz
opensim-SC_OLD-8411d7f356d07c7d5f3c1c41ac7412266f8ec314.tar.bz2
opensim-SC_OLD-8411d7f356d07c7d5f3c1c41ac7412266f8ec314.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index ba0ed95..b8c33b0 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -4145,6 +4145,8 @@ namespace OpenSim.Region.Framework.Scenes
4145 // do event notification 4145 // do event notification
4146 if (startedColliders.Count > 0) 4146 if (startedColliders.Count > 0)
4147 { 4147 {
4148 CollisionSounds.AvatarCollisionSound(this, startedColliders);
4149
4148 ColliderArgs StartCollidingMessage = new ColliderArgs(); 4150 ColliderArgs StartCollidingMessage = new ColliderArgs();
4149 List<DetectedObject> colliding = new List<DetectedObject>(); 4151 List<DetectedObject> colliding = new List<DetectedObject>();
4150 foreach (uint localId in startedColliders) 4152 foreach (uint localId in startedColliders)