aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL
diff options
context:
space:
mode:
authorCharles Krinke2008-07-16 01:00:40 +0000
committerCharles Krinke2008-07-16 01:00:40 +0000
commit620f7926f3f2ad05fdb72050a87e49d0fa2357dd (patch)
tree848c3c4071ff70f6e24c7e46741bca67b39495c4 /OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL
parentadd migration for SceneGroupID to char(36) plus add an index. This (diff)
downloadopensim-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/DotNetEngine/Compiler/LSL')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/YP2CSConverter.cs4
3 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
index 022cae4..ed6e783 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
@@ -486,6 +486,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
486 ", Error Number: " + CompErr.ErrorNumber + 486 ", Error Number: " + CompErr.ErrorNumber +
487 ", '" + CompErr.ErrorText + "'\r\n"; 487 ", '" + CompErr.ErrorText + "'\r\n";
488 } 488 }
489 Console.WriteLine("[COMPILER ERROR]:" + errtext);
489 if (!File.Exists(OutFile)) 490 if (!File.Exists(OutFile))
490 { 491 {
491 throw new Exception(errtext); 492 throw new Exception(errtext);
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
index db73f6b..1613502 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
@@ -59,6 +59,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
59 dataTypes.Add("rotation", "LSL_Types.Quaternion"); 59 dataTypes.Add("rotation", "LSL_Types.Quaternion");
60 dataTypes.Add("list", "LSL_Types.list"); 60 dataTypes.Add("list", "LSL_Types.list");
61 dataTypes.Add("null", "null"); 61 dataTypes.Add("null", "null");
62 dataTypes.Add("Int32", "LSL_Types.LSLInteger");
63 dataTypes.Add("int", "LSL_Types.LSLInteger");
62 } 64 }
63 65
64 public string Convert(string Script) 66 public string Convert(string Script)
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/YP2CSConverter.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/YP2CSConverter.cs
index b615baa..3f7b95e 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/YP2CSConverter.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/YP2CSConverter.cs
@@ -97,6 +97,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
97 @"this.$1(", 97 @"this.$1(",
98 RegexOptions.Compiled | RegexOptions.Singleline); 98 RegexOptions.Compiled | RegexOptions.Singleline);
99 finalcode = Regex.Replace(finalcode, 99 finalcode = Regex.Replace(finalcode,
100 @"YP.script_event\(Atom.a\(\""(.*?)""\)\,",
101 @"this.$1(",
102 RegexOptions.Compiled | RegexOptions.Singleline);
103 finalcode = Regex.Replace(finalcode,
100 @" static ", 104 @" static ",
101 @" ", 105 @" ",
102 RegexOptions.Compiled | RegexOptions.Singleline); 106 RegexOptions.Compiled | RegexOptions.Singleline);