diff options
author | Charles Krinke | 2008-07-16 01:00:40 +0000 |
---|---|---|
committer | Charles Krinke | 2008-07-16 01:00:40 +0000 |
commit | 620f7926f3f2ad05fdb72050a87e49d0fa2357dd (patch) | |
tree | 848c3c4071ff70f6e24c7e46741bca67b39495c4 /OpenSim/Region/ScriptEngine/Shared/CodeTools | |
parent | add migration for SceneGroupID to char(36) plus add an index. This (diff) | |
download | opensim-SC-620f7926f3f2ad05fdb72050a87e49d0fa2357dd.zip opensim-SC-620f7926f3f2ad05fdb72050a87e49d0fa2357dd.tar.gz opensim-SC-620f7926f3f2ad05fdb72050a87e49d0fa2357dd.tar.bz2 opensim-SC-620f7926f3f2ad05fdb72050a87e49d0fa2357dd.tar.xz |
Mantis#1753. Thank you kindly, Kinoc for a patch that:
Brings Yield Prolog up to date with sourceforge version 0.9.10
Patched applies to both DotNet and XEngine.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/CodeTools')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/CodeTools/YP2CSConverter.cs | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs index 09d816f..a8c61ed 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs | |||
@@ -544,6 +544,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools | |||
544 | ", Error Number: " + CompErr.ErrorNumber + | 544 | ", Error Number: " + CompErr.ErrorNumber + |
545 | ", '" + CompErr.ErrorText + "'\r\n"; | 545 | ", '" + CompErr.ErrorText + "'\r\n"; |
546 | } | 546 | } |
547 | Console.WriteLine("[COMPILER ERROR]:" + errtext); | ||
547 | if (!File.Exists(OutFile)) | 548 | if (!File.Exists(OutFile)) |
548 | { | 549 | { |
549 | throw new Exception(errtext); | 550 | throw new Exception(errtext); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/YP2CSConverter.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/YP2CSConverter.cs index 52c8251..831b918 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/YP2CSConverter.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/YP2CSConverter.cs | |||
@@ -98,6 +98,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools | |||
98 | @"this.$1(", | 98 | @"this.$1(", |
99 | RegexOptions.Compiled | RegexOptions.Singleline); | 99 | RegexOptions.Compiled | RegexOptions.Singleline); |
100 | finalcode = Regex.Replace(finalcode, | 100 | finalcode = Regex.Replace(finalcode, |
101 | @"YP.script_event\(Atom.a\(\""(.*?)""\)\,", | ||
102 | @"this.$1(", | ||
103 | RegexOptions.Compiled | RegexOptions.Singleline); | ||
104 | finalcode = Regex.Replace(finalcode, | ||
101 | @" static ", | 105 | @" static ", |
102 | @" ", | 106 | @" ", |
103 | RegexOptions.Compiled | RegexOptions.Singleline); | 107 | RegexOptions.Compiled | RegexOptions.Singleline); |