aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/CodeTools
diff options
context:
space:
mode:
authorMelanie2009-08-31 11:42:54 +0100
committerMelanie2009-08-31 11:42:54 +0100
commit090868ff4a90a63de522da6d2083a1e6c3845c95 (patch)
treeeeeccb9d7f1096b7773f7b532f148b2cad76f11d /OpenSim/Region/ScriptEngine/Shared/CodeTools
parentRecreate the shell of the AuthenticationService to squelch Windows build (diff)
downloadopensim-SC_OLD-090868ff4a90a63de522da6d2083a1e6c3845c95.zip
opensim-SC_OLD-090868ff4a90a63de522da6d2083a1e6c3845c95.tar.gz
opensim-SC_OLD-090868ff4a90a63de522da6d2083a1e6c3845c95.tar.bz2
opensim-SC_OLD-090868ff4a90a63de522da6d2083a1e6c3845c95.tar.xz
Change the return value if the compiler to "object" to allow compilers
to return dynamic method objects
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/CodeTools')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs4
1 files changed, 2 insertions, 2 deletions
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();