2 files changed, 122 insertions, 122 deletions

diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
index 78cfd21..6603323 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
@@ -1,120 +1,120 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-using System.IO;

-using Microsoft.CSharp;

-using System.CodeDom.Compiler;

-using System.Reflection;

-

-namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL

-{

-    

-    public class Compiler

-    {

-        private LSL2CSConverter LSL_Converter = new LSL2CSConverter();

-        private CSharpCodeProvider codeProvider = new CSharpCodeProvider();

-        private static UInt64 scriptCompileCounter = 0;

-        //private ICodeCompiler icc = codeProvider.CreateCompiler();

-        public string CompileFromFile(string LSOFileName)

-        {

-            switch (System.IO.Path.GetExtension(LSOFileName).ToLower())

-            {

-                case ".txt":

-                case ".lsl":

-                    Common.SendToDebug("Source code is LSL, converting to CS");

-                    return CompileFromLSLText(File.ReadAllText(LSOFileName));

-                case ".cs":

-                    Common.SendToDebug("Source code is CS");

-                    return CompileFromCSText(File.ReadAllText(LSOFileName));

-                default:

-                    throw new Exception("Unknown script type.");

-            }

-        }

-        /// <summary>

-        /// Converts script from LSL to CS and calls CompileFromCSText

-        /// </summary>

-        /// <param name="Script">LSL script</param>

-        /// <returns>Filename to .dll assembly</returns>

-        public string CompileFromLSLText(string Script)

-        {

-            if (Script.Substring(0, 4).ToLower() == "//c#")

-            {

-                return CompileFromCSText( Script );

-            }

-            else

-            {

-                return CompileFromCSText(LSL_Converter.Convert(Script));

-            }

-        }

-        /// <summary>

-        /// Compile CS script to .Net assembly (.dll)

-        /// </summary>

-        /// <param name="Script">CS script</param>

-        /// <returns>Filename to .dll assembly</returns>

-        public string CompileFromCSText(string Script)

-        {

-

-

-            // Output assembly name

-            scriptCompileCounter++;

-            string OutFile = Path.Combine("ScriptEngines", "Script_" + scriptCompileCounter + ".dll");

-            try

-            {

-                System.IO.File.Delete(OutFile);

-            }

-            catch (Exception e)

-            {

-                Console.WriteLine("Exception attempting to delete old compiled script: " + e.ToString());

-            }

-            //string OutFile = Path.Combine("ScriptEngines", "SecondLife.Script.dll");

-

-            // DEBUG - write source to disk

-            try

-            {

-                File.WriteAllText(Path.Combine("ScriptEngines", "debug_" + Path.GetFileNameWithoutExtension(OutFile) + ".cs"), Script);

-            }

-            catch { }

-

-            // Do actual compile

-            System.CodeDom.Compiler.CompilerParameters parameters = new CompilerParameters();

-            parameters.IncludeDebugInformation = true;

-            // Add all available assemblies

-            foreach (Assembly asm in AppDomain.CurrentDomain.GetAssemblies())

-            {

-                //Console.WriteLine("Adding assembly: " + asm.Location);

-                //parameters.ReferencedAssemblies.Add(asm.Location);

-            }

-

-            string rootPath = Path.GetDirectoryName(AppDomain.CurrentDomain.BaseDirectory);

-            string rootPathSE = Path.GetDirectoryName(this.GetType().Assembly.Location);

-            //Console.WriteLine("Assembly location: " + rootPath);

-            parameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenSim.Region.ScriptEngine.Common.dll"));

-            parameters.ReferencedAssemblies.Add(Path.Combine(rootPathSE, "OpenSim.Region.ScriptEngine.DotNetEngine.dll"));

-            

-            //parameters.ReferencedAssemblies.Add("OpenSim.Region.Environment");

-            parameters.GenerateExecutable = false;

-            parameters.OutputAssembly = OutFile;

-            parameters.IncludeDebugInformation = false;

-            CompilerResults results = codeProvider.CompileAssemblyFromSource(parameters, Script);

-

-            // Go through errors

-            // TODO: Return errors to user somehow

-            if (results.Errors.Count > 0)

-            {

-

-                string errtext = "";

-                foreach (CompilerError CompErr in results.Errors)

-                {

-                    errtext += "Line number " + (CompErr.Line - 1) +

-                        ", Error Number: " + CompErr.ErrorNumber +

-                        ", '" + CompErr.ErrorText + "'\r\n";

-                }

-                throw new Exception(errtext);

-            }

-

-

-            return OutFile;

-        }

-

-    }

-}

+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.IO;
+using Microsoft.CSharp;
+using System.CodeDom.Compiler;
+using System.Reflection;
+
+namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
+{
+    
+    public class Compiler
+    {
+        private LSL2CSConverter LSL_Converter = new LSL2CSConverter();
+        private CSharpCodeProvider codeProvider = new CSharpCodeProvider();
+        private static UInt64 scriptCompileCounter = 0;
+        //private ICodeCompiler icc = codeProvider.CreateCompiler();
+        public string CompileFromFile(string LSOFileName)
+        {
+            switch (System.IO.Path.GetExtension(LSOFileName).ToLower())
+            {
+                case ".txt":
+                case ".lsl":
+                    Common.SendToDebug("Source code is LSL, converting to CS");
+                    return CompileFromLSLText(File.ReadAllText(LSOFileName));
+                case ".cs":
+                    Common.SendToDebug("Source code is CS");
+                    return CompileFromCSText(File.ReadAllText(LSOFileName));
+                default:
+                    throw new Exception("Unknown script type.");
+            }
+        }
+        /// <summary>
+        /// Converts script from LSL to CS and calls CompileFromCSText
+        /// </summary>
+        /// <param name="Script">LSL script</param>
+        /// <returns>Filename to .dll assembly</returns>
+        public string CompileFromLSLText(string Script)
+        {
+            if (Script.Substring(0, 4).ToLower() == "//c#")
+            {
+                return CompileFromCSText( Script );
+            }
+            else
+            {
+                return CompileFromCSText(LSL_Converter.Convert(Script));
+            }
+        }
+        /// <summary>
+        /// Compile CS script to .Net assembly (.dll)
+        /// </summary>
+        /// <param name="Script">CS script</param>
+        /// <returns>Filename to .dll assembly</returns>
+        public string CompileFromCSText(string Script)
+        {
+
+
+            // Output assembly name
+            scriptCompileCounter++;
+            string OutFile = Path.Combine("ScriptEngines", "Script_" + scriptCompileCounter + ".dll");
+            try
+            {
+                System.IO.File.Delete(OutFile);
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine("Exception attempting to delete old compiled script: " + e.ToString());
+            }
+            //string OutFile = Path.Combine("ScriptEngines", "SecondLife.Script.dll");
+
+            // DEBUG - write source to disk
+            try
+            {
+                File.WriteAllText(Path.Combine("ScriptEngines", "debug_" + Path.GetFileNameWithoutExtension(OutFile) + ".cs"), Script);
+            }
+            catch { }
+
+            // Do actual compile
+            System.CodeDom.Compiler.CompilerParameters parameters = new CompilerParameters();
+            parameters.IncludeDebugInformation = true;
+            // Add all available assemblies
+            foreach (Assembly asm in AppDomain.CurrentDomain.GetAssemblies())
+            {
+                //Console.WriteLine("Adding assembly: " + asm.Location);
+                //parameters.ReferencedAssemblies.Add(asm.Location);
+            }
+
+            string rootPath = Path.GetDirectoryName(AppDomain.CurrentDomain.BaseDirectory);
+            string rootPathSE = Path.GetDirectoryName(this.GetType().Assembly.Location);
+            //Console.WriteLine("Assembly location: " + rootPath);
+            parameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenSim.Region.ScriptEngine.Common.dll"));
+            parameters.ReferencedAssemblies.Add(Path.Combine(rootPathSE, "OpenSim.Region.ScriptEngine.DotNetEngine.dll"));
+            
+            //parameters.ReferencedAssemblies.Add("OpenSim.Region.Environment");
+            parameters.GenerateExecutable = false;
+            parameters.OutputAssembly = OutFile;
+            parameters.IncludeDebugInformation = false;
+            CompilerResults results = codeProvider.CompileAssemblyFromSource(parameters, Script);
+
+            // Go through errors
+            // TODO: Return errors to user somehow
+            if (results.Errors.Count > 0)
+            {
+
+                string errtext = "";
+                foreach (CompilerError CompErr in results.Errors)
+                {
+                    errtext += "Line number " + (CompErr.Line - 1) +
+                        ", Error Number: " + CompErr.ErrorNumber +
+                        ", '" + CompErr.ErrorText + "'\r\n";
+                }
+                throw new Exception(errtext);
+            }
+
+
+            return OutFile;
+        }
+
+    }
+}
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs
index 1294213..18eddd0 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
             }
         }
 
-        public LSL_BuiltIn_Commands_Interface m_LSL_Functions;

+        public LSL_BuiltIn_Commands_Interface m_LSL_Functions;
         public string SourceCode = "";
 
         public LSL_BaseClass()
@@ -453,7 +453,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
         public int llGetUnixTime() { return m_LSL_Functions.llGetUnixTime(); }
         public int llGetParcelFlags(LSL_Types.Vector3 pos) { return m_LSL_Functions.llGetParcelFlags(pos); }
         public int llGetRegionFlags() { return m_LSL_Functions.llGetRegionFlags(); }
-        public string llXorBase64StringsCorrect(string str1, string str2) { return m_LSL_Functions.llXorBase64StringsCorrect(str1, str2); }

+        public string llXorBase64StringsCorrect(string str1, string str2) { return m_LSL_Functions.llXorBase64StringsCorrect(str1, str2); }
         public void llHTTPRequest(string url, List<string> parameters, string body) { m_LSL_Functions.llHTTPRequest(url, parameters, body); }
         public void llResetLandBanList() { m_LSL_Functions.llResetLandBanList(); }
         public void llResetLandPassList() { m_LSL_Functions.llResetLandPassList(); }