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

on sp its rootprim events mask..

Browse Source
This commit is contained in:
UbitUmarov
2020-09-04 17:17:24 +01:00
parent 6a5023650f
commit 8852aedca4
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2673,6 +2673,7 @@ namespace OpenSim.Region.Framework.Scenes
return false;
}
[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
private DetectedObject CreateDetObject(SceneObjectPart obj)
{
return new DetectedObject()
@@ -2689,6 +2690,7 @@ namespace OpenSim.Region.Framework.Scenes
};
}
[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
private DetectedObject CreateDetObject(ScenePresence av)
{
DetectedObject detobj = new DetectedObject()
@@ -2710,6 +2712,7 @@ namespace OpenSim.Region.Framework.Scenes
return detobj;
}
[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
private DetectedObject CreateDetObjectForGround()
{
return new DetectedObject()

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

@@ -6533,6 +6533,7 @@ namespace OpenSim.Region.Framework.Scenes
return true;
}
[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
private DetectedObject CreateDetObject(SceneObjectPart obj)
{
return new DetectedObject()
@@ -6549,6 +6550,7 @@ namespace OpenSim.Region.Framework.Scenes
};
}
[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
private DetectedObject CreateDetObject(ScenePresence av)
{
DetectedObject detobj = new DetectedObject()
@@ -6571,6 +6573,7 @@ namespace OpenSim.Region.Framework.Scenes
return detobj;
}
[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
private DetectedObject CreateDetObjectForGround()
{
DetectedObject detobj = new DetectedObject()
@@ -6621,15 +6624,14 @@ namespace OpenSim.Region.Framework.Scenes
private delegate void ScriptCollidingNotification(uint localID, ColliderArgs message);
[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
private void SendCollisionEvent(SceneObjectGroup dest, scriptEvents ev, List<uint> colliders, ScriptCollidingNotification notify)
{
ColliderArgs CollidingMessage;
if (colliders.Count > 0)
{
if ((dest.RootPart.ScriptEvents & ev) != 0)
{
CollidingMessage = CreateColliderArgs(dest.RootPart, colliders);
ColliderArgs CollidingMessage = CreateColliderArgs(dest.RootPart, colliders);
if (CollidingMessage.Colliders.Count > 0)
notify(dest.RootPart.LocalId, CollidingMessage);
@@ -6637,6 +6639,7 @@ namespace OpenSim.Region.Framework.Scenes
}
}
[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
private void SendLandCollisionEvent(SceneObjectGroup dest, scriptEvents ev, ScriptCollidingNotification notify)
{
if ((dest.RootPart.ScriptEvents & ev) != 0)
@@ -6774,14 +6777,14 @@ namespace OpenSim.Region.Framework.Scenes
for (int i = 0; i< attachements.Count; ++i)
{
SceneObjectGroup att = attachements[i];
if ((att.ScriptEvents & scriptEvents.anyobjcollision) != 0)
if ((att.RootPart.ScriptEvents & scriptEvents.anyobjcollision) != 0)
{
SendCollisionEvent(att, scriptEvents.collision_start, startedColliders, m_scene.EventManager.TriggerScriptCollidingStart);
SendCollisionEvent(att, scriptEvents.collision , m_lastColliders , m_scene.EventManager.TriggerScriptColliding);
SendCollisionEvent(att, scriptEvents.collision_end , endedColliders , m_scene.EventManager.TriggerScriptCollidingEnd);
}
if ((att.ScriptEvents & scriptEvents.anylandcollision) != 0)
if ((att.RootPart.ScriptEvents & scriptEvents.anylandcollision) != 0)
{
if (startLand)
SendLandCollisionEvent(att, scriptEvents.land_collision_start, m_scene.EventManager.TriggerScriptLandCollidingStart);