diff options
author | onefang | 2019-05-19 21:24:15 +1000 |
---|---|---|
committer | onefang | 2019-05-19 21:24:15 +1000 |
commit | 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb (patch) | |
tree | a9fbc62df9eb2d1d9ba2698d8552eae71eca20d8 /OpenSim/Tools/Compiler | |
parent | Add a build script. (diff) | |
download | opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.zip opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.gz opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.bz2 opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.xz |
Dump OpenSim 0.9.0.1 into it's own branch.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Tools/Compiler/Program.cs | 4 | ||||
-rw-r--r-- | OpenSim/Tools/Compiler/Properties/AssemblyInfo.cs | 10 |
2 files changed, 7 insertions, 7 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)) |
diff --git a/OpenSim/Tools/Compiler/Properties/AssemblyInfo.cs b/OpenSim/Tools/Compiler/Properties/AssemblyInfo.cs index d7f8870..fe29f27 100644 --- a/OpenSim/Tools/Compiler/Properties/AssemblyInfo.cs +++ b/OpenSim/Tools/Compiler/Properties/AssemblyInfo.cs | |||
@@ -2,7 +2,7 @@ | |||
2 | using System.Runtime.CompilerServices; | 2 | using System.Runtime.CompilerServices; |
3 | using System.Runtime.InteropServices; | 3 | using System.Runtime.InteropServices; |
4 | 4 | ||
5 | // General Information about an assembly is controlled through the following | 5 | // General Information about an assembly is controlled through the following |
6 | // set of attributes. Change these attribute values to modify the information | 6 | // set of attributes. Change these attribute values to modify the information |
7 | // associated with an assembly. | 7 | // associated with an assembly. |
8 | [assembly: AssemblyTitle("OpenSim.Tools.lslc")] | 8 | [assembly: AssemblyTitle("OpenSim.Tools.lslc")] |
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices; | |||
14 | [assembly: AssemblyTrademark("")] | 14 | [assembly: AssemblyTrademark("")] |
15 | [assembly: AssemblyCulture("")] | 15 | [assembly: AssemblyCulture("")] |
16 | 16 | ||
17 | // Setting ComVisible to false makes the types in this assembly not visible | 17 | // Setting ComVisible to false makes the types in this assembly not visible |
18 | // to COM components. If you need to access a type in this assembly from | 18 | // to COM components. If you need to access a type in this assembly from |
19 | // COM, set the ComVisible attribute to true on that type. | 19 | // COM, set the ComVisible attribute to true on that type. |
20 | [assembly: ComVisible(false)] | 20 | [assembly: ComVisible(false)] |
21 | 21 | ||
@@ -25,9 +25,9 @@ using System.Runtime.InteropServices; | |||
25 | // Version information for an assembly consists of the following four values: | 25 | // Version information for an assembly consists of the following four values: |
26 | // | 26 | // |
27 | // Major Version | 27 | // Major Version |
28 | // Minor Version | 28 | // Minor Version |
29 | // Build Number | 29 | // Build Number |
30 | // Revision | 30 | // Revision |
31 | // | 31 | // |
32 | [assembly: AssemblyVersion("0.8.3.*")] | 32 | [assembly: AssemblyVersion(OpenSim.VersionInfo.AssemblyVersionNumber)] |
33 | 33 | ||