diff options
| author | Melanie | 2009-10-02 08:23:38 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-02 08:23:38 +0100 |
| commit | 31d8cec0f8cd47ff445edc7771e5e73825a57927 (patch) | |
| tree | a2d60604317739fa530502c40ffc71bab2a5c494 /OpenSim/ScriptEngine | |
| parent | Restore the missing image handling to the image manager. The missing (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.zip opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.gz opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.bz2 opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.xz | |
Merge branch 'master' into diva-textures
Diffstat (limited to 'OpenSim/ScriptEngine')
3 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/ScriptEngine/Components/DotNetEngine/Compilers/CILCompiler.cs b/OpenSim/ScriptEngine/Components/DotNetEngine/Compilers/CILCompiler.cs index 2db9661..3d2d9d2 100644 --- a/OpenSim/ScriptEngine/Components/DotNetEngine/Compilers/CILCompiler.cs +++ b/OpenSim/ScriptEngine/Components/DotNetEngine/Compilers/CILCompiler.cs | |||
| @@ -179,7 +179,7 @@ namespace OpenSim.ScriptEngine.Components.DotNetEngine.Compilers | |||
| 179 | } | 179 | } |
| 180 | } | 180 | } |
| 181 | 181 | ||
| 182 | // TODO: Process errors | 182 | // TODO: Process errors |
| 183 | return OutFile; | 183 | return OutFile; |
| 184 | } | 184 | } |
| 185 | 185 | ||
diff --git a/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/BaseClassFactory.cs b/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/BaseClassFactory.cs index 3259686..afa2300 100644 --- a/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/BaseClassFactory.cs +++ b/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/BaseClassFactory.cs | |||
| @@ -36,7 +36,7 @@ using OpenSim.ScriptEngine.Shared; | |||
| 36 | namespace OpenSim.ScriptEngine.Components.DotNetEngine.Scheduler | 36 | namespace OpenSim.ScriptEngine.Components.DotNetEngine.Scheduler |
| 37 | { | 37 | { |
| 38 | public class BaseClassFactory | 38 | public class BaseClassFactory |
| 39 | { | 39 | { |
| 40 | 40 | ||
| 41 | 41 | ||
| 42 | public static void MakeBaseClass(ScriptStructure script) | 42 | public static void MakeBaseClass(ScriptStructure script) |
diff --git a/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/ScriptLoader.cs b/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/ScriptLoader.cs index f3b1496..3c20f20 100644 --- a/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/ScriptLoader.cs +++ b/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/ScriptLoader.cs | |||
| @@ -115,7 +115,7 @@ namespace OpenSim.ScriptEngine.Components.DotNetEngine.Scheduler | |||
| 115 | script.AppDomain = FreeAppDomain.CurrentAppDomain; | 115 | script.AppDomain = FreeAppDomain.CurrentAppDomain; |
| 116 | 116 | ||
| 117 | // Create instance of script | 117 | // Create instance of script |
| 118 | ScriptAssemblies.IScript mbrt = (ScriptAssemblies.IScript) | 118 | ScriptAssemblies.IScript mbrt = (ScriptAssemblies.IScript) |
| 119 | FreeAppDomain.CurrentAppDomain.CreateInstanceFromAndUnwrap( | 119 | FreeAppDomain.CurrentAppDomain.CreateInstanceFromAndUnwrap( |
| 120 | script.AssemblyFileName, "ScriptAssemblies.Script"); | 120 | script.AssemblyFileName, "ScriptAssemblies.Script"); |
| 121 | //, true, BindingFlags.CreateInstance, null); | 121 | //, true, BindingFlags.CreateInstance, null); |