diff options
Merge branch 'master' into diva-textures
Diffstat (limited to 'OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/ScriptLoader.cs')
-rw-r--r-- | OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/ScriptLoader.cs | 2 |
1 files changed, 1 insertions, 1 deletions
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); |