ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

a few changes on collision events

Browse Source
This commit is contained in:
UbitUmarov
2020-09-04 16:50:04 +01:00
parent d1fcb9c35d
commit 6a5023650f
3 changed files with 95 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2942,15 +2942,17 @@ namespace OpenSim.Region.Framework.Scenes
if (soundinfolist.Count > 0)
CollisionSounds.PartCollisionSound(this, soundinfolist);
}
EventManager eventmanager = ParentGroup.Scene.EventManager;
if ((ScriptEvents & scriptEvents.anyobjcollision) != 0)
{
SendCollisionEvent(scriptEvents.collision_start, startedColliders, eventmanager.TriggerScriptCollidingStart);
if (!VolumeDetectActive)
SendCollisionEvent(scriptEvents.collision , m_lastColliders , eventmanager.TriggerScriptColliding);
SendCollisionEvent(scriptEvents.collision_end , endedColliders , eventmanager.TriggerScriptCollidingEnd);
}
SendCollisionEvent(scriptEvents.collision_start, startedColliders, eventmanager.TriggerScriptCollidingStart);
if (!VolumeDetectActive)
SendCollisionEvent(scriptEvents.collision , m_lastColliders , eventmanager.TriggerScriptColliding);
SendCollisionEvent(scriptEvents.collision_end , endedColliders , eventmanager.TriggerScriptCollidingEnd);
if (!VolumeDetectActive)
if (!VolumeDetectActive && (ScriptEvents & scriptEvents.anylandcollision) != 0)
{
if (startLand)
SendLandCollisionEvent(scriptEvents.land_collision_start, eventmanager.TriggerScriptLandCollidingStart);