diff options
Diffstat (limited to 'OpenSim/Region')
4 files changed, 7 insertions, 7 deletions
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 | |||
152 | { | 152 | { |
153 | // Compile (We assume LSL) | 153 | // Compile (We assume LSL) |
154 | CompiledScriptFile = | 154 | CompiledScriptFile = |
155 | LSLCompiler.PerformScriptCompile(Script, | 155 | (string)LSLCompiler.PerformScriptCompile(Script, |
156 | assetID.ToString(), taskInventoryItem.OwnerID); | 156 | assetID.ToString(), taskInventoryItem.OwnerID); |
157 | 157 | ||
158 | if (presence != null && (!postOnRez)) | 158 | 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 | |||
34 | { | 34 | { |
35 | public interface ICompiler | 35 | public interface ICompiler |
36 | { | 36 | { |
37 | string PerformScriptCompile(string source, string asset, UUID ownerID); | 37 | object PerformScriptCompile(string source, string asset, UUID ownerID); |
38 | string[] GetWarnings(); | 38 | string[] GetWarnings(); |
39 | Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> | 39 | Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> |
40 | LineMap(); | 40 | LineMap(); |
41 | string GetAssemblyName(UUID assetID); | 41 | object GetCompilerOutput(UUID assetID); |
42 | } | 42 | } |
43 | } | 43 | } |
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 | |||
259 | // } | 259 | // } |
260 | //} | 260 | //} |
261 | 261 | ||
262 | public string GetAssemblyName(UUID assetID) | 262 | public object GetCompilerOutput(UUID assetID) |
263 | { | 263 | { |
264 | return Path.Combine(ScriptEnginesPath, Path.Combine( | 264 | return Path.Combine(ScriptEnginesPath, Path.Combine( |
265 | m_scriptEngine.World.RegionInfo.RegionID.ToString(), | 265 | m_scriptEngine.World.RegionInfo.RegionID.ToString(), |
@@ -271,7 +271,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools | |||
271 | /// </summary> | 271 | /// </summary> |
272 | /// <param name="Script">LSL script</param> | 272 | /// <param name="Script">LSL script</param> |
273 | /// <returns>Filename to .dll assembly</returns> | 273 | /// <returns>Filename to .dll assembly</returns> |
274 | public string PerformScriptCompile(string Script, string asset, UUID ownerUUID) | 274 | public object PerformScriptCompile(string Script, string asset, UUID ownerUUID) |
275 | { | 275 | { |
276 | m_positionMap = null; | 276 | m_positionMap = null; |
277 | m_warnings.Clear(); | 277 | 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 | |||
590 | { | 590 | { |
591 | lock (m_AddingAssemblies) | 591 | lock (m_AddingAssemblies) |
592 | { | 592 | { |
593 | assembly = m_Compiler.PerformScriptCompile(script, | 593 | assembly = (string)m_Compiler.PerformScriptCompile(script, |
594 | assetID.ToString(), item.OwnerID); | 594 | assetID.ToString(), item.OwnerID); |
595 | if (!m_AddingAssemblies.ContainsKey(assembly)) { | 595 | if (!m_AddingAssemblies.ContainsKey(assembly)) { |
596 | m_AddingAssemblies[assembly] = 1; | 596 | m_AddingAssemblies[assembly] = 1; |
597 | } else { | 597 | } else { |