diff options
| author | John Hurliman | 2009-09-30 15:28:23 -0700 |
|---|---|---|
| committer | John Hurliman | 2009-09-30 15:28:23 -0700 |
| commit | acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009 (patch) | |
| tree | 305349e1bd0a5849fd7f96483e24d5e07b24b8f4 /OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/ScriptLoader.cs | |
| parent | * Adding Scale to EntityBase * Fixing the incorrect initialization of EntityB... (diff) | |
| parent | Formatting cleanup. (diff) | |
| download | opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.zip opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.gz opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.bz2 opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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); |