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

more on scripts *target* events

Browse Source
This commit is contained in:
UbitUmarov
2020-02-26 19:18:07 +00:00
parent 94f88e330b
commit ad5aff2d17
5 changed files with 37 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/ScriptEngine/YEngine/XMRInstBackend.cs
View File

@@ -594,7 +594,8 @@ namespace OpenSim.Region.ScriptEngine.Yengine
AsyncCommandManager.RemoveScript(m_Engine, m_LocalID, m_ItemID);
m_XMRLSLApi.acm.TimerPlugin.CreateFromData(m_LocalID, m_ItemID, UUID.Zero, timers);
// Tell whoever cares which event handlers the new state has.
// Tell whoever cares which event handlers the new state has.
m_Part.RemoveScriptTargets(m_ItemID);
m_Part.SetScriptEvents(m_ItemID, GetStateEventFlags(stateCode));
// keep link messages

18
OpenSim/Region/ScriptEngine/YEngine/XMRInstMisc.cs
View File

@@ -66,8 +66,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine
// up. This makes sure we decrement m_CompiledScriptRefCount.
~XMRInstance()
{
if(!m_disposed)
Dispose();
Dispose(false);
}
/**
@@ -76,11 +75,20 @@ namespace OpenSim.Region.ScriptEngine.Yengine
*/
public void Dispose()
{
// Tell script stop executing next time it calls CheckRun().
Dispose(true);
//GC.SuppressFinalize(this);
}
public void Dispose(bool fromdispose)
{
if (m_disposed)
return;
// Tell script stop executing next time it calls CheckRun().
suspendOnCheckRunHold = true;
// Don't send us any more events.
lock(m_RunLock)
// Don't send us any more events.
lock (m_RunLock)
{
if(m_Part != null)
{

1
OpenSim/Region/ScriptEngine/YEngine/XMRInstRun.cs
View File

@@ -904,6 +904,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine
// 'state_entry()' event handler.
m_RunOnePhase = "ResetLocked: posting default:state_entry() event";
stateCode = 0;
m_Part.RemoveScriptTargets(m_ItemID);
m_Part.SetScriptEvents(m_ItemID, GetStateEventFlags(0));
PostEvent(new EventParams("state_entry",
zeroObjectArray,