diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs index b71afe3..87f7189 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs | |||
@@ -610,6 +610,7 @@ namespace SecondLife | |||
610 | results = CScodeProvider.CompileAssemblyFromSource( | 610 | results = CScodeProvider.CompileAssemblyFromSource( |
611 | parameters, Script); | 611 | parameters, Script); |
612 | } | 612 | } |
613 | |||
613 | // Deal with an occasional segv in the compiler. | 614 | // Deal with an occasional segv in the compiler. |
614 | // Rarely, if ever, occurs twice in succession. | 615 | // Rarely, if ever, occurs twice in succession. |
615 | // Line # == 0 and no file name are indications that | 616 | // Line # == 0 and no file name are indications that |
@@ -647,15 +648,19 @@ namespace SecondLife | |||
647 | "language type \"" + lang.ToString() + "\""); | 648 | "language type \"" + lang.ToString() + "\""); |
648 | } | 649 | } |
649 | 650 | ||
650 | // Check result | 651 | // foreach (Type type in results.CompiledAssembly.GetTypes()) |
651 | // Go through errors | 652 | // { |
653 | // foreach (MethodInfo method in type.GetMethods(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Static)) | ||
654 | // { | ||
655 | // m_log.DebugFormat("[COMPILER]: {0}.{1}", type.FullName, method.Name); | ||
656 | // } | ||
657 | // } | ||
652 | 658 | ||
653 | // | 659 | // |
654 | // WARNINGS AND ERRORS | 660 | // WARNINGS AND ERRORS |
655 | // | 661 | // |
656 | bool hadErrors = false; | 662 | bool hadErrors = false; |
657 | string errtext = String.Empty; | 663 | string errtext = String.Empty; |
658 | |||
659 | if (results.Errors.Count > 0) | 664 | if (results.Errors.Count > 0) |
660 | { | 665 | { |
661 | foreach (CompilerError CompErr in results.Errors) | 666 | foreach (CompilerError CompErr in results.Errors) |