OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

avinationmerge
ubit 2012-05-17 05:43:24 +02:00
parent 8411d7f356 e4231e95a9
commit b8a71c1195
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Framework/Scenes/CollisionSounds.cs
View File

@ -167,7 +167,7 @@ namespace OpenSim.Region.Framework.Scenes
SceneObjectPart otherPart = part.ParentGroup.Scene.GetSceneObjectPart(Id);
if (otherPart != null)
{
if (otherPart.CollisionSound == part.invalidCollisionSoundUUID)
if (otherPart.CollisionSound == part.invalidCollisionSoundUUID || otherPart.VolumeDetectActive)
continue;
if (otherPart.CollisionSound != UUID.Zero)
otherPart.SendCollisionSound(otherPart.CollisionSound, otherPart.CollisionSoundVolume);

2
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -3425,7 +3425,7 @@ namespace OpenSim.Region.Framework.Scenes
//PhysicsActor.OnRequestTerseUpdate += SendTerseUpdateToAllClients;
PhysicsActor.OnCollisionUpdate += PhysicsCollisionUpdate;
PhysicsActor.OnOutOfBounds += OutOfBoundsCall; // Called for PhysicsActors when there's something wrong
PhysicsActor.SubscribeEvents(500);
PhysicsActor.SubscribeEvents(100);
PhysicsActor.LocalID = LocalId;
}