diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine/Compiler')
4 files changed, 13 insertions, 10 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs index c81e6bd..0623cc5 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs | |||
@@ -39,7 +39,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL | |||
39 | private LSL2CSConverter LSL_Converter = new LSL2CSConverter(); | 39 | private LSL2CSConverter LSL_Converter = new LSL2CSConverter(); |
40 | private CSharpCodeProvider codeProvider = new CSharpCodeProvider(); | 40 | private CSharpCodeProvider codeProvider = new CSharpCodeProvider(); |
41 | private static UInt64 scriptCompileCounter = 0; | 41 | private static UInt64 scriptCompileCounter = 0; |
42 | private static int instanceID = new Random().Next(0, int.MaxValue); // Implemented due to peer preassure --- will cause garbage in ScriptEngines folder ;) | 42 | |
43 | private static int instanceID = new Random().Next(0, int.MaxValue); | ||
44 | // Implemented due to peer preassure --- will cause garbage in ScriptEngines folder ;) | ||
45 | |||
43 | //private ICodeCompiler icc = codeProvider.CreateCompiler(); | 46 | //private ICodeCompiler icc = codeProvider.CreateCompiler(); |
44 | public string CompileFromFile(string LSOFileName) | 47 | public string CompileFromFile(string LSOFileName) |
45 | { | 48 | { |
@@ -83,7 +86,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL | |||
83 | { | 86 | { |
84 | // Output assembly name | 87 | // Output assembly name |
85 | scriptCompileCounter++; | 88 | scriptCompileCounter++; |
86 | string OutFile = Path.Combine("ScriptEngines", "DotNetScript_" + instanceID.ToString() + "_" + scriptCompileCounter.ToString() + ".dll"); | 89 | string OutFile = |
90 | Path.Combine("ScriptEngines", | ||
91 | "DotNetScript_" + instanceID.ToString() + "_" + scriptCompileCounter.ToString() + ".dll"); | ||
87 | try | 92 | try |
88 | { | 93 | { |
89 | File.Delete(OutFile); | 94 | File.Delete(OutFile); |
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs index 4063647..8e37798 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs | |||
@@ -316,8 +316,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL | |||
316 | 316 | ||
317 | 317 | ||
318 | quotes.Clear(); | 318 | quotes.Clear(); |
319 | 319 | ||
320 | return Return; | 320 | return Return; |
321 | } | 321 | } |
322 | } | 322 | } |
323 | } | 323 | } \ No newline at end of file |
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs index a9297fd..2796b64 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs | |||
@@ -1638,7 +1638,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL | |||
1638 | 1638 | ||
1639 | public LSL_Types.list llListReplaceList(LSL_Types.list dest, LSL_Types.list src, int start, int end) | 1639 | public LSL_Types.list llListReplaceList(LSL_Types.list dest, LSL_Types.list src, int start, int end) |
1640 | { | 1640 | { |
1641 | return m_LSL_Functions.llListReplaceList(dest,src,start,end); | 1641 | return m_LSL_Functions.llListReplaceList(dest, src, start, end); |
1642 | } | 1642 | } |
1643 | 1643 | ||
1644 | public void llLoadURL(string avatar_id, string message, string url) | 1644 | public void llLoadURL(string avatar_id, string message, string url) |
@@ -2025,7 +2025,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL | |||
2025 | public const int REMOTE_DATA_CHANNEL = 1; | 2025 | public const int REMOTE_DATA_CHANNEL = 1; |
2026 | public const int REMOTE_DATA_REQUEST = 2; | 2026 | public const int REMOTE_DATA_REQUEST = 2; |
2027 | public const int REMOTE_DATA_REPLY = 3; | 2027 | public const int REMOTE_DATA_REPLY = 3; |
2028 | 2028 | ||
2029 | public const int PRIM_MATERIAL = 2; | 2029 | public const int PRIM_MATERIAL = 2; |
2030 | public const int PRIM_PHYSICS = 3; | 2030 | public const int PRIM_PHYSICS = 3; |
2031 | public const int PRIM_TEMP_ON_REZ = 4; | 2031 | public const int PRIM_TEMP_ON_REZ = 4; |
@@ -2041,7 +2041,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL | |||
2041 | public const int PRIM_FLEXIBLE = 21; | 2041 | public const int PRIM_FLEXIBLE = 21; |
2042 | public const int PRIM_TEXGEN = 22; | 2042 | public const int PRIM_TEXGEN = 22; |
2043 | public const int PRIM_CAST_SHADOWS = 24; // Not implemented, here for completeness sake | 2043 | public const int PRIM_CAST_SHADOWS = 24; // Not implemented, here for completeness sake |
2044 | public const int PRIM_POINT_LIGHT = 23; // Huh? | 2044 | public const int PRIM_POINT_LIGHT = 23; // Huh? |
2045 | public const int PRIM_TEXGEN_DEFAULT = 0; | 2045 | public const int PRIM_TEXGEN_DEFAULT = 0; |
2046 | public const int PRIM_TEXGEN_PLANAR = 1; | 2046 | public const int PRIM_TEXGEN_PLANAR = 1; |
2047 | public const int PRIM_TYPE_BOX = 0; | 2047 | public const int PRIM_TYPE_BOX = 0; |
@@ -2122,4 +2122,4 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL | |||
2122 | public vector ZERO_VECTOR = new vector(0, 0, 0); | 2122 | public vector ZERO_VECTOR = new vector(0, 0, 0); |
2123 | public rotation ZERO_ROTATION = new rotation(0, 0, 0, 0); | 2123 | public rotation ZERO_ROTATION = new rotation(0, 0, 0, 0); |
2124 | } | 2124 | } |
2125 | } | 2125 | } \ No newline at end of file |
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs index bc47241..d5a31fb 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs | |||
@@ -28,13 +28,11 @@ | |||
28 | 28 | ||
29 | using System; | 29 | using System; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Collections; | ||
32 | using System.Runtime.Remoting.Lifetime; | 31 | using System.Runtime.Remoting.Lifetime; |
33 | using System.Text; | 32 | using System.Text; |
34 | using System.Threading; | 33 | using System.Threading; |
35 | using Axiom.Math; | 34 | using Axiom.Math; |
36 | using libsecondlife; | 35 | using libsecondlife; |
37 | using libsecondlife.StructuredData; | ||
38 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
39 | using OpenSim.Region.Environment.Interfaces; | 37 | using OpenSim.Region.Environment.Interfaces; |
40 | using OpenSim.Region.Environment.Scenes; | 38 | using OpenSim.Region.Environment.Scenes; |