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

don't subscribe collision events for nonphysical parts only because of 

collision sounds. Let them be passive
avinationmerge
UbitUmarov 2012-07-14 20:10:38 +01:00
parent 72e2b94094
commit 1dca94c72f
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,6 +31,7 @@ using System.Reflection;
using System.Collections.Generic; using System.Collections.Generic;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Physics.Manager;
using log4net; using log4net;
namespace OpenSim.Region.Framework.Scenes namespace OpenSim.Region.Framework.Scenes

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

@ -4917,7 +4917,7 @@ namespace OpenSim.Region.Framework.Scenes
pa.OnCollisionUpdate -= PhysicsCollision; pa.OnCollisionUpdate -= PhysicsCollision;
bool hassound = (CollisionSoundType >= 0 && !VolumeDetectActive); bool hassound = (!VolumeDetectActive && CollisionSoundType >= 0 && ((Flags & PrimFlags.Physics) != 0));
scriptEvents CombinedEvents = AggregateScriptEvents; scriptEvents CombinedEvents = AggregateScriptEvents;