diff options
| author | Melanie | 2012-03-06 01:45:20 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-06 01:45:20 +0000 |
| commit | 5004d0ad09ecb82ffa4ebbf1ff789761e11aad97 (patch) | |
| tree | 47b527a5cfe7d7103c85755a344654dd14701e5d /OpenSim/Region/ScriptEngine | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fix off by one error in script error reporting. (diff) | |
| download | opensim-SC-5004d0ad09ecb82ffa4ebbf1ff789761e11aad97.zip opensim-SC-5004d0ad09ecb82ffa4ebbf1ff789761e11aad97.tar.gz opensim-SC-5004d0ad09ecb82ffa4ebbf1ff789761e11aad97.tar.bz2 opensim-SC-5004d0ad09ecb82ffa4ebbf1ff789761e11aad97.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs index 8b88588..65d3b9b 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs | |||
| @@ -118,7 +118,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools | |||
| 118 | emessage = emessage.Substring(slinfo.Length+2); | 118 | emessage = emessage.Substring(slinfo.Length+2); |
| 119 | 119 | ||
| 120 | message = String.Format("({0},{1}) {2}", | 120 | message = String.Format("({0},{1}) {2}", |
| 121 | e.slInfo.lineNumber - 2, | 121 | e.slInfo.lineNumber - 1, |
| 122 | e.slInfo.charPosition - 1, emessage); | 122 | e.slInfo.charPosition - 1, emessage); |
| 123 | 123 | ||
| 124 | throw new Exception(message); | 124 | throw new Exception(message); |