1 files changed, 9 insertions, 1 deletions

diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index a2bc397..1a7d044 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -79,7 +79,15 @@ namespace OpenSim.Region.ScriptEngine.Common
                 if (m_state != value)
                 {
                     m_state = value;
-                    m_ScriptEngine.m_EventManager.state_entry(m_localID);
+                    try
+                    {
+                        m_ScriptEngine.m_EventManager.state_entry(m_localID);
+
+                    }
+                    catch (AppDomainUnloadedException)
+                    {
+                        System.Console.WriteLine("[SCRIPT]: state change called when script was unloaded.  Nothing to worry about, but noting the occurance");
+                    }
                 }
             }
         }