diff options
| author | Justin Clark-Casey (justincc) | 2012-06-21 02:24:44 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-06-21 02:24:44 +0100 |
| commit | d24122b706cb3ec4ac9c8d1efc30e511a07e1aa7 (patch) | |
| tree | 3afedee8bbb3f85d7e5fed71bc089d717259cda2 | |
| parent | Retrigger build - last jenkins run was glitched (diff) | |
| download | opensim-SC_OLD-d24122b706cb3ec4ac9c8d1efc30e511a07e1aa7.zip opensim-SC_OLD-d24122b706cb3ec4ac9c8d1efc30e511a07e1aa7.tar.gz opensim-SC_OLD-d24122b706cb3ec4ac9c8d1efc30e511a07e1aa7.tar.bz2 opensim-SC_OLD-d24122b706cb3ec4ac9c8d1efc30e511a07e1aa7.tar.xz | |
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
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 10 |
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 | |||
| 330 | } | 330 | } |
| 331 | else | 331 | else |
| 332 | { | 332 | { |
| 333 | m_log.ErrorFormat( | 333 | m_log.WarnFormat( |
| 334 | "[SCRIPT INSTANCE]: Unable to load script state file {0} from assembly {1}: Memory limit exceeded", | 334 | "[SCRIPT INSTANCE]: Unable to load script state file {0} for script {1} {2} in {3} {4} (assembly {5}). Memory limit exceeded", |
| 335 | savedState, assembly); | 335 | savedState, ScriptName, ItemID, PrimName, ObjectID, assembly); |
| 336 | } | 336 | } |
| 337 | } | 337 | } |
| 338 | catch (Exception e) | 338 | catch (Exception e) |
| 339 | { | 339 | { |
| 340 | m_log.ErrorFormat( | 340 | m_log.ErrorFormat( |
| 341 | "[SCRIPT INSTANCE]: Unable to load script state file {0} from assembly {1}. XML is {2}. Exception {3}{4}", | 341 | "[SCRIPT INSTANCE]: Unable to load script state file {0} for script {1} {2} in {3} {4} (assembly {5}). XML is {6}. Exception {7}{8}", |
| 342 | savedState, assembly, xml, e.Message, e.StackTrace); | 342 | savedState, ScriptName, ItemID, PrimName, ObjectID, assembly, xml, e.Message, e.StackTrace); |
| 343 | } | 343 | } |
| 344 | } | 344 | } |
| 345 | // else | 345 | // else |