Restore "friendly errors" to the XEngine

1 files changed, 11 insertions, 2 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
index e8f2b71..a825eff 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
@@ -99,10 +99,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                 string message;
 
                 // LL start numbering lines at 0 - geeks!
+                // Also need to subtract one line we prepend!
                 //
+                string emessage = e.Message;
+                string slinfo = e.slInfo.ToString();
+
+                // Remove wrong line number info
+                //
+                if (emessage.StartsWith(slinfo+": "))
+                    emessage = emessage.Substring(slinfo.Length+2);
+
                 message = String.Format("Line ({0},{1}) {2}",
-                        e.slInfo.lineNumber - 1,
-                        e.slInfo.charPosition - 1, e.Message);
+                        e.slInfo.lineNumber - 2,
+                        e.slInfo.charPosition - 1, emessage);
 
                 throw new Exception(message);
             }