aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-06-18 22:20:25 +0100
committerJustin Clark-Casey (justincc)2014-06-18 22:24:36 +0100
commita0d6705fe670cbfe76e199c40cb56508e166bf31 (patch)
tree9484bce90ac09d27f8b8c6336731a1ced404bed3 /OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
parentFix previous commit to ignore water height and allow flying underwater (swimm... (diff)
downloadopensim-SC-a0d6705fe670cbfe76e199c40cb56508e166bf31.zip
opensim-SC-a0d6705fe670cbfe76e199c40cb56508e166bf31.tar.gz
opensim-SC-a0d6705fe670cbfe76e199c40cb56508e166bf31.tar.bz2
opensim-SC-a0d6705fe670cbfe76e199c40cb56508e166bf31.tar.xz
Fix issue with LSL jumps screwing up the C# compiler error -> LSL code position map and leading to invalid error line numbers/columns
This is because jump statement generation was mistakenly inserting its own line without updating the csharp positions in CSCodeGenerator. This is Aleric Inglewood's patch in http://opensimulator.org/mantis/view.php?id=7195 but applied to opensim itself rather than the defunct code generation in opensim-libs. Thanks! This patch also adds a regression test for this case from myself.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
index 8b8e038..4e0c273 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
@@ -626,11 +626,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
626 string labelStatement; 626 string labelStatement;
627 627
628 if (m_insertCoopTerminationChecks) 628 if (m_insertCoopTerminationChecks)
629 labelStatement = m_coopTerminationCheck + "\n"; 629 labelStatement = m_coopTerminationCheck;
630 else 630 else
631 labelStatement = "NoOp();\n"; 631 labelStatement = "NoOp();";
632 632
633 return Generate(String.Format("{0}: ", CheckName(jl.LabelName)), jl) + labelStatement; 633 return GenerateLine(String.Format("{0}: {1}", CheckName(jl.LabelName), labelStatement), jl);
634 } 634 }
635 635
636 /// <summary> 636 /// <summary>