2 files changed, 14 insertions, 2 deletions

diff --git a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
index 3f6f5cc..cb4ca39 100644
--- a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
+++ b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
@@ -106,7 +106,11 @@ namespace OpenSim.Region.ScriptEngine.Common
             get { return m_LSL_Functions.State; }
             set { m_LSL_Functions.State = value;  }
         }
-
+        public void state(string state)
+        {
+            State = state;
+            
+        }
 
 
         public void Start(BuilIn_Commands LSL_Functions)
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");
+                    }
                 }
             }
         }