aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/DotNetEngine
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/DotNetEngine
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/DotNetEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs2
1 files changed, 1 insertions, 1 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))