Add item id, name, prim name and id to log message when state exists but loading fails.

Drop logging about memory limit exceeded to warn from error

1 files changed, 5 insertions, 5 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 8c53b1f..5dfe58e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -330,16 +330,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                     }
                     else
                     {
-                        m_log.ErrorFormat(
-                            "[SCRIPT INSTANCE]: Unable to load script state file {0} from assembly {1}: Memory limit exceeded",
-                            savedState, assembly);
+                        m_log.WarnFormat(
+                            "[SCRIPT INSTANCE]: Unable to load script state file {0} for script {1} {2} in {3} {4} (assembly {5}).  Memory limit exceeded",
+                            savedState, ScriptName, ItemID, PrimName, ObjectID, assembly);
                     }
                 }
                 catch (Exception e)
                 {
                      m_log.ErrorFormat(
-                         "[SCRIPT INSTANCE]: Unable to load script state file {0} from assembly {1}.  XML is {2}.  Exception {3}{4}",
-                         savedState, assembly, xml, e.Message, e.StackTrace);
+                         "[SCRIPT INSTANCE]: Unable to load script state file {0} for script {1} {2} in {3} {4} (assembly {5}).  XML is {6}.  Exception {7}{8}",
+                         savedState, ScriptName, ItemID, PrimName, ObjectID, assembly, xml, e.Message, e.StackTrace);
                 }
             }
 //            else