aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-06-21 02:09:14 +0100
committerJustin Clark-Casey (justincc)2012-06-21 02:09:14 +0100
commit5709bed548aa4897d84bb616a2c344e158fe89ff (patch)
treec9f18efeaa19e54159720e7f8261839aae5e24f3 /OpenSim
parentUse HasPrivateAttachmentPoint properties in SOG.DeleteGroupFromScene() instea... (diff)
downloadopensim-SC-5709bed548aa4897d84bb616a2c344e158fe89ff.zip
opensim-SC-5709bed548aa4897d84bb616a2c344e158fe89ff.tar.gz
opensim-SC-5709bed548aa4897d84bb616a2c344e158fe89ff.tar.bz2
opensim-SC-5709bed548aa4897d84bb616a2c344e158fe89ff.tar.xz
Add state file location to errors logged when there's some issue with retrieving state (e.g. exceeds memory limit)
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 329e361..b8bcb35 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -331,15 +331,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
331 else 331 else
332 { 332 {
333 m_log.ErrorFormat( 333 m_log.ErrorFormat(
334 "[SCRIPT INSTANCE]: Unable to load script state from assembly {0}: Memory limit exceeded", 334 "[SCRIPT INSTANCE]: Unable to load script state file {0} from assembly {1}: Memory limit exceeded",
335 assembly); 335 savedState, 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 from assembly {0}. XML is {1}. Exception {2}{3}", 341 "[SCRIPT INSTANCE]: Unable to load script state file {0} from assembly {1}. XML is {2}. Exception {3}{4}",
342 assembly, xml, e.Message, e.StackTrace); 342 savedState, assembly, xml, e.Message, e.StackTrace);
343 } 343 }
344 } 344 }
345// else 345// else