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

* refactor: call some EventManager triggers directly rather than through scene

0.6.5-rc1
Justin Clarke Casey 2009-03-27 20:41:35 +00:00
parent bce5ed5812
commit 30ffefb67b
3 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -534,7 +534,6 @@ namespace OpenSim.Region.Framework.Scenes
return found; return found;
} }
// Alias IncomingHelloNeighbour OtherRegionUp, for now // Alias IncomingHelloNeighbour OtherRegionUp, for now
public bool IncomingHelloNeighbour(RegionInfo neighbour) public bool IncomingHelloNeighbour(RegionInfo neighbour)
{ {
@ -3065,21 +3064,6 @@ namespace OpenSim.Region.Framework.Scenes
scriptEngine.InitializeEngine(this); scriptEngine.InitializeEngine(this);
} }
public void TriggerObjectChanged(uint localID, uint change)
{
m_eventManager.TriggerOnScriptChangedEvent(localID, change);
}
public void TriggerAtTargetEvent(uint localID, uint handle, Vector3 targetpos, Vector3 currentpos)
{
m_eventManager.TriggerAtTargetEvent(localID, handle, targetpos, currentpos);
}
public void TriggerNotAtTargetEvent(uint localID)
{
m_eventManager.TriggerNotAtTargetEvent(localID);
}
private bool ScriptDanger(SceneObjectPart part,Vector3 pos) private bool ScriptDanger(SceneObjectPart part,Vector3 pos)
{ {
ILandObject parcel = LandChannel.GetLandObject(pos.X, pos.Y); ILandObject parcel = LandChannel.GetLandObject(pos.X, pos.Y);

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

@ -2939,6 +2939,7 @@ namespace OpenSim.Region.Framework.Scenes
} }
} }
} }
if (atTargets.Count > 0) if (atTargets.Count > 0)
{ {
uint[] localids = new uint[0]; uint[] localids = new uint[0];
@ -2952,16 +2953,20 @@ namespace OpenSim.Region.Framework.Scenes
cntr++; cntr++;
} }
} }
for (int ctr = 0; ctr < localids.Length; ctr++) for (int ctr = 0; ctr < localids.Length; ctr++)
{ {
foreach (uint target in atTargets.Keys) foreach (uint target in atTargets.Keys)
{ {
scriptPosTarget att = atTargets[target]; scriptPosTarget att = atTargets[target];
m_scene.TriggerAtTargetEvent(localids[ctr], att.handle, att.targetPos, m_rootPart.GroupPosition); m_scene.EventManager.TriggerAtTargetEvent(
localids[ctr], att.handle, att.targetPos, m_rootPart.GroupPosition);
} }
} }
return; return;
} }
if (m_scriptListens_notAtTarget && !at_target) if (m_scriptListens_notAtTarget && !at_target)
{ {
//trigger not_at_target //trigger not_at_target
@ -2976,9 +2981,10 @@ namespace OpenSim.Region.Framework.Scenes
cntr++; cntr++;
} }
} }
for (int ctr = 0; ctr < localids.Length; ctr++) for (int ctr = 0; ctr < localids.Length; ctr++)
{ {
m_scene.TriggerNotAtTargetEvent(localids[ctr]); m_scene.EventManager.TriggerNotAtTargetEvent(localids[ctr]);
} }
} }
} }

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

@ -3101,11 +3101,8 @@ if (m_shape != null) {
public void TriggerScriptChangedEvent(Changed val) public void TriggerScriptChangedEvent(Changed val)
{ {
if (m_parentGroup != null) if (m_parentGroup != null && m_parentGroup.Scene != null)
{ m_parentGroup.Scene.EventManager.TriggerOnScriptChangedEvent(LocalId, (uint)val);
if (m_parentGroup.Scene != null)
m_parentGroup.Scene.TriggerObjectChanged(LocalId, (uint)val);
}
} }
public void TrimPermissions() public void TrimPermissions()