From 25e200c46a7664eb23499c39e6a1019470e26edc Mon Sep 17 00:00:00 2001
From: Tedd Hansen
Date: Sun, 26 Aug 2007 08:20:48 +0000
Subject: Fixed bug that occurs sometimes on script unload where queued script
 event was attempted executed after AppDomain was unloaded.

---
 OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs')

diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
index c7c33bb..5dc928a 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
@@ -362,9 +362,18 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
             // Execute a function in the script
             //m_scriptEngine.Log.Verbose("ScriptEngine", "Executing Function localID: " + localID + ", itemID: " + itemID + ", FunctionName: " + FunctionName);
             LSL_BaseClass Script = m_scriptEngine.myScriptManager.GetScript(localID, itemID);
+            if (Script == null)
+                return;
 
             // Must be done in correct AppDomain, so leaving it up to the script itself
-            Script.Exec.ExecuteEvent(FunctionName, args);
+            try
+            {
+                Script.Exec.ExecuteEvent(FunctionName, args);
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine("Exception executing script funcion: " + e.ToString());
+            }
 
         }
 
-- 
cgit v1.1