aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2012-05-17 04:41:46 +0100
committerUbitUmarov2012-05-17 04:41:46 +0100
commite4231e95a976f8b3c02add39b94721eebb639674 (patch)
tree7f01cc8316dfd102397ffec0d779cd972d63511a /OpenSim
parent add avatar colision sounds. Changed test sound UUID (diff)
downloadopensim-SC_OLD-e4231e95a976f8b3c02add39b94721eebb639674.zip
opensim-SC_OLD-e4231e95a976f8b3c02add39b94721eebb639674.tar.gz
opensim-SC_OLD-e4231e95a976f8b3c02add39b94721eebb639674.tar.bz2
opensim-SC_OLD-e4231e95a976f8b3c02add39b94721eebb639674.tar.xz
increase avatars collisions report to 10 per sec, Stopped sound on avatar to volumedetect collision
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/CollisionSounds.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/CollisionSounds.cs b/OpenSim/Region/Framework/Scenes/CollisionSounds.cs
index a22ee10..c46756c 100644
--- a/OpenSim/Region/Framework/Scenes/CollisionSounds.cs
+++ b/OpenSim/Region/Framework/Scenes/CollisionSounds.cs
@@ -167,7 +167,7 @@ namespace OpenSim.Region.Framework.Scenes
167 SceneObjectPart otherPart = part.ParentGroup.Scene.GetSceneObjectPart(Id); 167 SceneObjectPart otherPart = part.ParentGroup.Scene.GetSceneObjectPart(Id);
168 if (otherPart != null) 168 if (otherPart != null)
169 { 169 {
170 if (otherPart.CollisionSound == part.invalidCollisionSoundUUID) 170 if (otherPart.CollisionSound == part.invalidCollisionSoundUUID || otherPart.VolumeDetectActive)
171 continue; 171 continue;
172 if (otherPart.CollisionSound != UUID.Zero) 172 if (otherPart.CollisionSound != UUID.Zero)
173 otherPart.SendCollisionSound(otherPart.CollisionSound, otherPart.CollisionSoundVolume); 173 otherPart.SendCollisionSound(otherPart.CollisionSound, otherPart.CollisionSoundVolume);
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index b8c33b0..ebddf21 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3425,7 +3425,7 @@ namespace OpenSim.Region.Framework.Scenes
3425 //PhysicsActor.OnRequestTerseUpdate += SendTerseUpdateToAllClients; 3425 //PhysicsActor.OnRequestTerseUpdate += SendTerseUpdateToAllClients;
3426 PhysicsActor.OnCollisionUpdate += PhysicsCollisionUpdate; 3426 PhysicsActor.OnCollisionUpdate += PhysicsCollisionUpdate;
3427 PhysicsActor.OnOutOfBounds += OutOfBoundsCall; // Called for PhysicsActors when there's something wrong 3427 PhysicsActor.OnOutOfBounds += OutOfBoundsCall; // Called for PhysicsActors when there's something wrong
3428 PhysicsActor.SubscribeEvents(500); 3428 PhysicsActor.SubscribeEvents(100);
3429 PhysicsActor.LocalID = LocalId; 3429 PhysicsActor.LocalID = LocalId;
3430 } 3430 }
3431 3431