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

mantis 8706: avoid spurius logs on Yengine during object delete

master
UbitUmarov 2020-05-24 15:04:44 +01:00
parent cc4e14a88d
commit 5f52de2578
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -309,7 +309,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine
Exception e = null; Exception e = null;
// Maybe it has been Disposed() // Maybe it has been Disposed()
if(m_Part == null) if(m_Part == null || m_Part.Inventory == null)
{ {
m_RunOnePhase = "runone saw it disposed"; m_RunOnePhase = "runone saw it disposed";
return XMRInstState.DISPOSED; return XMRInstState.DISPOSED;
@ -534,10 +534,17 @@ namespace OpenSim.Region.ScriptEngine.Yengine
eventCode = ScriptEventCode.None; eventCode = ScriptEventCode.None;
stackFrames = null; stackFrames = null;
if(m_Part == null || m_Part.Inventory == null)
{
//we are gone and don't know it still
m_SleepUntil = DateTime.MaxValue;
return;
}
if (e is ScriptDeleteException) if (e is ScriptDeleteException)
{ {
// Script did something like llRemoveInventory(llGetScriptName()); // Script did something like llRemoveInventory(llGetScriptName());
// ... to delete itself from the object. // ... to delete itself from the object.
m_SleepUntil = DateTime.MaxValue; m_SleepUntil = DateTime.MaxValue;
Verbose("[YEngine]: script self-delete {0}", m_ItemID); Verbose("[YEngine]: script self-delete {0}", m_ItemID);
m_Part.Inventory.RemoveInventoryItem(m_ItemID); m_Part.Inventory.RemoveInventoryItem(m_ItemID);