lotek/opensim
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Actually remove the script if it tries to remove itself.

Browse Source 
Fixes Mantis #2929
This commit is contained in:
Melanie Thielker
2009-04-12 12:03:07 +00:00
parent f6f3737fe8
commit 2864c45678
4 changed files with 38 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs
View File

@@ -168,6 +168,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
private ScriptEngine lastScriptEngine;
private uint lastLocalID;
private UUID lastItemID;
// Queue processing thread loop
private void EventQueueThreadLoop()
@@ -201,6 +202,14 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
lastScriptEngine.World.DeleteSceneObject(
part.ParentGroup, false);
}
catch (ScriptDeleteException) // Must delete item
{
SceneObjectPart part =
lastScriptEngine.World.GetSceneObjectPart(
lastLocalID);
if (part != null && part.ParentGroup != null)
part.Inventory.RemoveInventoryItem(lastItemID);
}
catch (Exception e)
{
m_log.ErrorFormat("[{0}]: Exception {1} thrown", ScriptEngineName, e.GetType().ToString());
@@ -284,6 +293,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
QIS.localID))
{
lastLocalID = QIS.localID;
lastItemID = QIS.itemID;
LastExecutionStarted = DateTime.Now.Ticks;
KillCurrentScript = false;
InExecution = true;