diff options
author | Melanie | 2009-12-22 09:30:50 +0000 |
---|---|---|
committer | Melanie | 2009-12-22 09:30:50 +0000 |
commit | 28c7bb99bf8a051493566718c1bcee7e2e5b515f (patch) | |
tree | 936309b7086baa1bac48b6366126e9551ca5f73b /OpenSim/Region/ScriptEngine/Shared/Instance | |
parent | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff) | |
parent | FINALLY! Script compile errors now appear in the script error pane, (diff) | |
download | opensim-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/Instance')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 2 |
1 files changed, 1 insertions, 1 deletions
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 | |||
974 | if (col == 0) | 974 | if (col == 0) |
975 | col++; | 975 | col++; |
976 | message = string.Format("Runtime error:\n" + | 976 | message = string.Format("Runtime error:\n" + |
977 | "Line ({0}): {1}", scriptLine - 1, | 977 | "({0}): {1}", scriptLine - 1, |
978 | e.InnerException.Message); | 978 | e.InnerException.Message); |
979 | 979 | ||
980 | System.Console.WriteLine(e.ToString()+"\n"); | 980 | System.Console.WriteLine(e.ToString()+"\n"); |