From 090868ff4a90a63de522da6d2083a1e6c3845c95 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 31 Aug 2009 11:42:54 +0100
Subject: Change the return value if the compiler to "object" to allow
 compilers to return dynamic method objects

---
 OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs | 2 +-
 OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs       | 4 ++--
 OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs  | 4 ++--
 OpenSim/Region/ScriptEngine/XEngine/XEngine.cs            | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
index 15d6c2c..9c1cd4d 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
@@ -152,7 +152,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
             {
                 // Compile (We assume LSL)
                 CompiledScriptFile =
-                        LSLCompiler.PerformScriptCompile(Script,
+                        (string)LSLCompiler.PerformScriptCompile(Script,
                         assetID.ToString(), taskInventoryItem.OwnerID);
 
                 if (presence != null && (!postOnRez))
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs b/OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs
index 7456ca9..1e35559 100644
--- a/OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs
+++ b/OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs
@@ -34,10 +34,10 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
 {
     public interface ICompiler
     {
-        string PerformScriptCompile(string source, string asset, UUID ownerID);
+        object PerformScriptCompile(string source, string asset, UUID ownerID);
         string[] GetWarnings();
         Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>>
                 LineMap();
-        string GetAssemblyName(UUID assetID);
+        object GetCompilerOutput(UUID assetID);
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
index 35f791e..cb5664b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
@@ -259,7 +259,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
         //    }
         //}
 
-        public string GetAssemblyName(UUID assetID)
+        public object GetCompilerOutput(UUID assetID)
         {
             return Path.Combine(ScriptEnginesPath, Path.Combine(
                     m_scriptEngine.World.RegionInfo.RegionID.ToString(),
@@ -271,7 +271,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
         /// </summary>
         /// <param name="Script">LSL script</param>
         /// <returns>Filename to .dll assembly</returns>
-        public string PerformScriptCompile(string Script, string asset, UUID ownerUUID)
+        public object PerformScriptCompile(string Script, string asset, UUID ownerUUID)
         {
             m_positionMap = null;
             m_warnings.Clear();
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 76218c8..9a972c2 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -590,8 +590,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             {
                 lock (m_AddingAssemblies) 
                 {
-                    assembly = m_Compiler.PerformScriptCompile(script,
-                                                               assetID.ToString(), item.OwnerID);
+                    assembly = (string)m_Compiler.PerformScriptCompile(script,
+                            assetID.ToString(), item.OwnerID);
                     if (!m_AddingAssemblies.ContainsKey(assembly)) {
                         m_AddingAssemblies[assembly] = 1;
                     } else {
-- 
cgit v1.1