1 files changed, 17 insertions, 8 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 9ff2e4d..34f2cc7 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -110,7 +110,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
         private Dictionary<string,IScriptApi> m_Apis = new Dictionary<string,IScriptApi>();
 
         // Script state
-        private string m_State="default";
+        private string m_State = "default";
 
         public Object[] PluginData = new Object[0];
 
@@ -128,6 +128,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                     m_minEventDelay = value;
                 else 
                     m_minEventDelay = 0.0;
+
                 m_eventDelayTicks = (long)(m_minEventDelay * 10000000L);
                 m_nextEventTimeTicks = DateTime.Now.Ticks;
             }
@@ -298,8 +299,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[Script] Error loading assembly {0}\n"+e.ToString(), assembly);
-                throw;
+                m_log.ErrorFormat(
+                    "[SCRIPT INSTANCE]: Error loading assembly {0}.  Exception {1}{2}",
+                    assembly, e.Message, e.StackTrace);
             }
 
             try
@@ -314,9 +316,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                 part.SetScriptEvents(m_ItemID,
                                      (int)m_Script.GetStateEventFlags(State));
             }
-            catch (Exception)
+            catch (Exception e)
             {
-                // m_log.Error("[Script] Error loading script instance\n"+e.ToString());
+                m_log.ErrorFormat(
+                    "[SCRIPT INSTANCE]: Error loading script instance from assembly {0}.  Exception {1}{2}",
+                    assembly, e.Message, e.StackTrace);
+
                 return;
             }
 
@@ -378,12 +383,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                     }
                     else
                     {
-                        // m_log.Error("[Script] Unable to load script state: Memory limit exceeded");
+                        m_log.ErrorFormat(
+                            "[SCRIPT INSTANCE]: Unable to load script state from assembly {0}: Memory limit exceeded",
+                            assembly);
                     }
                 }
-                catch (Exception)
+                catch (Exception e)
                 {
-                    // m_log.ErrorFormat("[Script] Unable to load script state from xml: {0}\n"+e.ToString(), xml);
+                     m_log.ErrorFormat(
+                         "[SCRIPT INSTANCE]: Unable to load script state from assembly {0}.  XML is {1}.  Exception {2}{3}",
+                         assembly, xml, e.Message, e.StackTrace);
                 }
             }
 //            else