diff options
author | Charles Krinke | 2008-06-05 19:30:35 +0000 |
---|---|---|
committer | Charles Krinke | 2008-06-05 19:30:35 +0000 |
commit | d66de839385617bdcfb9a52de6bef8a5f496dbca (patch) | |
tree | 2fe28272216364d34dd626a7cb95505339625867 /OpenSim | |
parent | * Applied 9085B_[5004]_xengine_abort_regression.patch from #1437 (diff) | |
download | opensim-SC_OLD-d66de839385617bdcfb9a52de6bef8a5f496dbca.zip opensim-SC_OLD-d66de839385617bdcfb9a52de6bef8a5f496dbca.tar.gz opensim-SC_OLD-d66de839385617bdcfb9a52de6bef8a5f496dbca.tar.bz2 opensim-SC_OLD-d66de839385617bdcfb9a52de6bef8a5f496dbca.tar.xz |
Mantis#1459. Thank you kindly, CMickeyb for a patch that:
the function that reports errors in event handling is not computing the
line numbers correctly for windows paths (and probably linux paths).
As a result, the conversion to int throws an exception.
note... i'm not sure why we extract the line number, convert it to an int,
then convert it back to a string... but hey... :-)
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs index 43f9f03..11a9982 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs | |||
@@ -302,11 +302,14 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
302 | int idx=t.IndexOf("SecondLife.Script."); | 302 | int idx=t.IndexOf("SecondLife.Script."); |
303 | if (idx != -1) | 303 | if (idx != -1) |
304 | { | 304 | { |
305 | int colon=t.IndexOf(":"); | 305 | // Need to skip past windows paths that have "c:\" in them |
306 | int colon=t.LastIndexOf(":"); | ||
306 | 307 | ||
307 | if (-1 != colon) | 308 | if (-1 != colon) |
308 | { | 309 | { |
309 | line = " at line " + Convert.ToInt32(t.Substring(colon + 1)).ToString(); | 310 | // Not sure why this is converted to an int then back to a string, either |
311 | // way, need to skip the word "line " in the substring | ||
312 | line = " at line " + Convert.ToInt32(t.Substring(colon + 6)).ToString(); | ||
310 | break; | 313 | break; |
311 | } | 314 | } |
312 | } | 315 | } |