diff options
| author | UbitUmarov | 2017-01-05 19:32:57 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-05 19:32:57 +0000 |
| commit | 254b26a7d51143d4e08229fa0b0fceabd76a41d0 (patch) | |
| tree | 8ed65006e5dc04e69ceba67e31075a9e505e64f6 /OpenSim/Tools/Compiler/Program.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | Massive tab and trailing space cleanup (diff) | |
| download | opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.zip opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.gz opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.bz2 opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.xz | |
fix merge
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Tools/Compiler/Program.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Tools/Compiler/Program.cs b/OpenSim/Tools/Compiler/Program.cs index b010eaf..9270c96 100644 --- a/OpenSim/Tools/Compiler/Program.cs +++ b/OpenSim/Tools/Compiler/Program.cs | |||
| @@ -38,7 +38,7 @@ namespace OpenSim.Tools.LSL.Compiler | |||
| 38 | class Program | 38 | class Program |
| 39 | { | 39 | { |
| 40 | // Commented out because generated warning since m_positionMap could never be anything other than null | 40 | // Commented out because generated warning since m_positionMap could never be anything other than null |
| 41 | // private static Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> m_positionMap; | 41 | // private static Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> m_positionMap; |
| 42 | private static CSharpCodeProvider CScodeProvider = new CSharpCodeProvider(); | 42 | private static CSharpCodeProvider CScodeProvider = new CSharpCodeProvider(); |
| 43 | 43 | ||
| 44 | static void Main(string[] args) | 44 | static void Main(string[] args) |
| @@ -154,7 +154,7 @@ namespace OpenSim.Tools.LSL.Compiler | |||
| 154 | lslPos.Key - 1, lslPos.Value - 1, | 154 | lslPos.Key - 1, lslPos.Value - 1, |
| 155 | CompErr.ErrorNumber, text, severity); | 155 | CompErr.ErrorNumber, text, severity); |
| 156 | } | 156 | } |
| 157 | 157 | ||
| 158 | disp = "Completed with errors"; | 158 | disp = "Completed with errors"; |
| 159 | 159 | ||
| 160 | if (!File.Exists(OutFile)) | 160 | if (!File.Exists(OutFile)) |