OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
0.7.4.1
Justin Clark-Casey (justincc) 2012-06-21 02:24:44 +01:00
parent afcabf5244
commit d24122b706
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
View File

@ -330,16 +330,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
} }
else else
{ {
m_log.ErrorFormat( m_log.WarnFormat(
"[SCRIPT INSTANCE]: Unable to load script state file {0} from assembly {1}: Memory limit exceeded", "[SCRIPT INSTANCE]: Unable to load script state file {0} for script {1} {2} in {3} {4} (assembly {5}). Memory limit exceeded",
savedState, assembly); savedState, ScriptName, ItemID, PrimName, ObjectID, assembly);
} }
} }
catch (Exception e) catch (Exception e)
{ {
m_log.ErrorFormat( m_log.ErrorFormat(
"[SCRIPT INSTANCE]: Unable to load script state file {0} from assembly {1}. XML is {2}. Exception {3}{4}", "[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, assembly, xml, e.Message, e.StackTrace); savedState, ScriptName, ItemID, PrimName, ObjectID, assembly, xml, e.Message, e.StackTrace);
} }
} }
// else // else