diff options
| author | Melanie | 2009-08-31 11:42:54 +0100 |
|---|---|---|
| committer | Melanie | 2009-08-31 11:42:54 +0100 |
| commit | 090868ff4a90a63de522da6d2083a1e6c3845c95 (patch) | |
| tree | eeeccb9d7f1096b7773f7b532f148b2cad76f11d /OpenSim/Region/ScriptEngine/XEngine | |
| parent | Recreate the shell of the AuthenticationService to squelch Windows build (diff) | |
| download | opensim-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/XEngine')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 4 |
1 files changed, 2 insertions, 2 deletions
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 { |