aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
diff options
context:
space:
mode:
authorMelanie2009-12-22 09:30:50 +0000
committerMelanie2009-12-22 09:30:50 +0000
commit28c7bb99bf8a051493566718c1bcee7e2e5b515f (patch)
tree936309b7086baa1bac48b6366126e9551ca5f73b /OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
parentMerge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff)
parentFINALLY! Script compile errors now appear in the script error pane, (diff)
downloadopensim-SC-28c7bb99bf8a051493566718c1bcee7e2e5b515f.zip
opensim-SC-28c7bb99bf8a051493566718c1bcee7e2e5b515f.tar.gz
opensim-SC-28c7bb99bf8a051493566718c1bcee7e2e5b515f.tar.bz2
opensim-SC-28c7bb99bf8a051493566718c1bcee7e2e5b515f.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs2
1 files changed, 1 insertions, 1 deletions
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
623 623
624 // The Second Life viewer's script editor begins 624 // The Second Life viewer's script editor begins
625 // countingn lines and columns at 0, so we subtract 1. 625 // countingn lines and columns at 0, so we subtract 1.
626 errtext += String.Format("Line ({0},{1}): {4} {2}: {3}\n", 626 errtext += String.Format("({0},{1}): {4} {2}: {3}\n",
627 lslPos.Key - 1, lslPos.Value - 1, 627 lslPos.Key - 1, lslPos.Value - 1,
628 CompErr.ErrorNumber, text, severity); 628 CompErr.ErrorNumber, text, severity);
629 hadErrors = true; 629 hadErrors = true;