Merge branch 'master' into careminster

4 files changed, 5 insertions, 5 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
index e427f50..b1fb6c2 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
@@ -111,7 +111,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                 if (emessage.StartsWith(slinfo+": "))
                     emessage = emessage.Substring(slinfo.Length+2);
 
-                message = String.Format("Line ({0},{1}) {2}",
+                message = String.Format("({0},{1}) {2}",
                         e.slInfo.lineNumber - 2,
                         e.slInfo.charPosition - 1, emessage);
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
index 3080c71..d8c0ba5 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
@@ -623,7 +623,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
 
                         // The Second Life viewer's script editor begins
                         // countingn lines and columns at 0, so we subtract 1.
-                        errtext += String.Format("Line ({0},{1}): {4} {2}: {3}\n",
+                        errtext += String.Format("({0},{1}): {4} {2}: {3}\n",
                                 lslPos.Key - 1, lslPos.Value - 1,
                                 CompErr.ErrorNumber, text, severity);
                         hadErrors = true;
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CSCodeGeneratorTest.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CSCodeGeneratorTest.cs
index 3ca7f7c..63afb0b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CSCodeGeneratorTest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CSCodeGeneratorTest.cs
@@ -1673,7 +1673,7 @@ default
             {
                 // The syntax error is on line 6, char 5 (expected ';', found
                 // '}').
-                Assert.AreEqual("Line (4,4) syntax error", e.Message);
+                Assert.AreEqual("(4,4) syntax error", e.Message);
                 throw;
             }
         }
@@ -1698,7 +1698,7 @@ default
             catch (System.Exception e)
             {
                 // The syntax error is on line 5, char 14 (Syntax error)
-                Assert.AreEqual("Line (3,13) syntax error", e.Message);
+                Assert.AreEqual("(3,13) syntax error", e.Message);
 
                 throw;
             }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 8333a27..6ecafd4 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -974,7 +974,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                             if (col == 0)
                                 col++;
                             message = string.Format("Runtime error:\n" +
-                                    "Line ({0}): {1}", scriptLine - 1,
+                                    "({0}): {1}", scriptLine - 1,
                                     e.InnerException.Message);
 
                             System.Console.WriteLine(e.ToString()+"\n");