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

filter some changed events at trigger point

Browse Source
This commit is contained in:
UbitUmarov
2020-09-04 15:31:42 +01:00
parent 23de4e3a82
commit d1fcb9c35d
5 changed files with 17 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
View File

@@ -564,7 +564,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
foreach (SceneObjectGroup grp in sp.GetAttachments())
{
sp.Scene.EventManager.TriggerOnScriptChangedEvent(grp.LocalId, (uint)Changed.TELEPORT);
if ((grp.ScriptEvents & scriptEvents.changed) != 0)
sp.Scene.EventManager.TriggerOnScriptChangedEvent(grp.LocalId, (uint)Changed.TELEPORT);
}
m_entityTransferStateMachine.UpdateInTransit(sp.UUID, AgentTransferState.CleaningUp);

5
OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
View File

@@ -223,7 +223,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
{
m_animations.SetDefaultAnimation(overridenAnim, m_scenePresence.ControllingClient.NextAnimationSequenceNumber, m_scenePresence.UUID);
}
m_scenePresence.SendScriptEventToAttachments("changed", new Object[] { (int)Changed.ANIMATION });
m_scenePresence.SendScriptChangedEventToAttachments(Changed.ANIMATION);
SendAnimPack();
ret = true;
}
@@ -239,8 +239,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
// "[SCENE PRESENCE ANIMATOR]: Updating movement animation to {0} for {1}",
// anim, m_scenePresence.Name);
// 16384 is CHANGED_ANIMATION
m_scenePresence.SendScriptEventToAttachments("changed", new Object[] { (int)Changed.ANIMATION });
m_scenePresence.SendScriptChangedEventToAttachments(Changed.ANIMATION);
SendAnimPack();
ret = true;
}

5
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@@ -689,7 +689,7 @@ namespace OpenSim.Region.Framework.Scenes
}
// now that position is changed tell it to scripts
if (triggerScriptEvent)
if (triggerScriptEvent && (ScriptEvents & scriptEvents.changed) != 0)
{
foreach (SceneObjectPart part in parts)
{
@@ -2277,6 +2277,8 @@ namespace OpenSim.Region.Framework.Scenes
private scriptEvents lastRootPartPhysEvents = 0;
public scriptEvents ScriptEvents;
public void aggregateScriptEvents()
{
PrimFlags objectflagupdate = (PrimFlags)RootPart.GetEffectiveObjectFlags();
@@ -2328,6 +2330,7 @@ namespace OpenSim.Region.Framework.Scenes
parts[i].UpdatePhysicsSubscribedEvents();
}
ScriptEvents = aggregatedScriptEvents;
ScheduleGroupForFullUpdate();
}

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

@@ -4503,7 +4503,8 @@ namespace OpenSim.Region.Framework.Scenes
public void TriggerScriptChangedEvent(Changed val, object data = null)
{
if (ParentGroup != null && ParentGroup.Scene != null)
//if (ParentGroup != null && ParentGroup.Scene != null && (ScriptEvents & scriptEvents.changed) != 0)
if ((ScriptEvents & scriptEvents.changed) != 0)
ParentGroup.Scene.EventManager.TriggerOnScriptChangedEvent(LocalId, (uint)val, data);
}

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

@@ -5850,36 +5850,21 @@ namespace OpenSim.Region.Framework.Scenes
}
}
/// <summary>
/// Send a script event to this scene presence's attachments
/// </summary>
/// <param name="eventName">The name of the event</param>
/// <param name="args">The arguments for the event</param>
public void SendScriptEventToAttachments(string eventName, Object[] args)
public void SendScriptChangedEventToAttachments(Changed val)
{
Util.FireAndForget(delegate(object x)
lock (m_attachments)
{
if (m_scriptEngines.Length == 0)
return;
lock (m_attachments)
foreach (SceneObjectGroup grp in m_attachments)
{
foreach (SceneObjectGroup grp in m_attachments)
if ((grp.ScriptEvents & scriptEvents.changed) != 0)
{
// 16384 is CHANGED_ANIMATION
//
// Send this to all attachment root prims
//
foreach (IScriptModule m in m_scriptEngines)
foreach(SceneObjectPart sop in grp.Parts)
{
if (m == null) // No script engine loaded
continue;
m.PostObjectEvent(grp.RootPart.UUID, "changed", new Object[] { (int)Changed.ANIMATION });
sop.TriggerScriptChangedEvent(val);
}
}
}
}, null, "ScenePresence.SendScriptEventToAttachments");
}
}
/// <summary>