Added OnRemoveScript event handler to ScriptEngine. Fixed event queuing of empty objects crash.

1 files changed, 4 insertions, 0 deletions

diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
index 3ef21db..23cd4e8 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
@@ -239,6 +239,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
             lock (QueueLock)

             {

 

+                // Do we have any scripts in this object at all? If not, return

+                if (myScriptEngine.myScriptManager.Scripts.ContainsKey(localID) == false)

+                    return;

+

                 foreach (LLUUID itemID in myScriptEngine.myScriptManager.GetScriptKeys(localID))

                 {

                     // Add to each script in that object