aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorCharles Krinke2008-08-10 16:39:04 +0000
committerCharles Krinke2008-08-10 16:39:04 +0000
commita9f1561380cbf95b9ce2f19f1a15168e982c763d (patch)
treedb4bc129507ddab064f24a3b8790723f479f2304
parentAttempt to address Mantis #1905, #1909 (diff)
downloadopensim-SC-a9f1561380cbf95b9ce2f19f1a15168e982c763d.zip
opensim-SC-a9f1561380cbf95b9ce2f19f1a15168e982c763d.tar.gz
opensim-SC-a9f1561380cbf95b9ce2f19f1a15168e982c763d.tar.bz2
opensim-SC-a9f1561380cbf95b9ce2f19f1a15168e982c763d.tar.xz
Mantis#1910. Thank you kindly, HomerHorwitz for a patch that:
In case you run the server with mono --debug OpenSim.exe line numbers are reported as <filename>:<linenumber>, so no "at line" is found. That led to an exception, which is caught since r5766. The attached patch fixes this for mono;
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs
index 4969df0..43905a7 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs
@@ -319,7 +319,11 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
319 // way, need to skip the word "line " in the substring 319 // way, need to skip the word "line " in the substring
320 try 320 try
321 { 321 {
322 line = " at line " + Convert.ToInt32(t.Substring(colon + 6)).ToString(); 322 // ...if it is there. With mono --debug OpenSim.exe,
323 // you'll get the error in the format filename:linenumber
324 if(colon + 6 < t.Length && t.Substring(colon + 1, 5).Equals("line ")) colon += 6;
325 else ++colon; // else only skip the colon
326 line = " at line " + Convert.ToInt32(t.Substring(colon)).ToString();
323 } 327 }
324 catch (ArgumentOutOfRangeException e2) 328 catch (ArgumentOutOfRangeException e2)
325 { 329 {