diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs index 841ed26..d54d2f5 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs | |||
@@ -40,8 +40,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools | |||
40 | { | 40 | { |
41 | public class Compiler | 41 | public class Compiler |
42 | { | 42 | { |
43 | private static readonly log4net.ILog m_log | 43 | // private static readonly log4net.ILog m_log |
44 | = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 44 | // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); |
45 | 45 | ||
46 | // * Uses "LSL2Converter" to convert LSL to C# if necessary. | 46 | // * Uses "LSL2Converter" to convert LSL to C# if necessary. |
47 | // * Compiles C#-code into an assembly | 47 | // * Compiles C#-code into an assembly |
@@ -79,7 +79,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools | |||
79 | private static CSharpCodeProvider YPcodeProvider = new CSharpCodeProvider(); // YP is translated into CSharp | 79 | private static CSharpCodeProvider YPcodeProvider = new CSharpCodeProvider(); // YP is translated into CSharp |
80 | private static YP2CSConverter YP_Converter = new YP2CSConverter(); | 80 | private static YP2CSConverter YP_Converter = new YP2CSConverter(); |
81 | 81 | ||
82 | private static int instanceID = new Random().Next(0, int.MaxValue); // Unique number to use on our compiled files | 82 | // private static int instanceID = new Random().Next(0, int.MaxValue); // Unique number to use on our compiled files |
83 | private static UInt64 scriptCompileCounter = 0; // And a counter | 83 | private static UInt64 scriptCompileCounter = 0; // And a counter |
84 | 84 | ||
85 | public IScriptEngine m_scriptEngine; | 85 | public IScriptEngine m_scriptEngine; |
@@ -273,7 +273,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools | |||
273 | { | 273 | { |
274 | Directory.CreateDirectory(ScriptEnginesPath); | 274 | Directory.CreateDirectory(ScriptEnginesPath); |
275 | } | 275 | } |
276 | catch (Exception ex) | 276 | catch (Exception) |
277 | { | 277 | { |
278 | } | 278 | } |
279 | } | 279 | } |
@@ -285,7 +285,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools | |||
285 | { | 285 | { |
286 | Directory.CreateDirectory(ScriptEnginesPath); | 286 | Directory.CreateDirectory(ScriptEnginesPath); |
287 | } | 287 | } |
288 | catch (Exception ex) | 288 | catch (Exception) |
289 | { | 289 | { |
290 | } | 290 | } |
291 | } | 291 | } |
@@ -486,7 +486,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools | |||
486 | // } | 486 | // } |
487 | 487 | ||
488 | string rootPath = Path.GetDirectoryName(AppDomain.CurrentDomain.BaseDirectory); | 488 | string rootPath = Path.GetDirectoryName(AppDomain.CurrentDomain.BaseDirectory); |
489 | string rootPathSE = Path.GetDirectoryName(GetType().Assembly.Location); | 489 | // string rootPathSE = Path.GetDirectoryName(GetType().Assembly.Location); |
490 | //Console.WriteLine("Assembly location: " + rootPath); | 490 | //Console.WriteLine("Assembly location: " + rootPath); |
491 | parameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenSim.Region.ScriptEngine.Shared.dll")); | 491 | parameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenSim.Region.ScriptEngine.Shared.dll")); |
492 | parameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenSim.Region.ScriptEngine.Shared.Api.Runtime.dll")); | 492 | parameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenSim.Region.ScriptEngine.Shared.Api.Runtime.dll")); |