diff options
| author | Melanie | 2012-04-18 23:23:37 +0100 |
|---|---|---|
| committer | Melanie | 2012-04-18 23:23:37 +0100 |
| commit | beb7b8d189a99b4385392b2209930e20b489a0c9 (patch) | |
| tree | 515ebbd6c437a329b4316e97a7c16c410cd95284 /OpenSim | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-beb7b8d189a99b4385392b2209930e20b489a0c9.zip opensim-SC_OLD-beb7b8d189a99b4385392b2209930e20b489a0c9.tar.gz opensim-SC_OLD-beb7b8d189a99b4385392b2209930e20b489a0c9.tar.bz2 opensim-SC_OLD-beb7b8d189a99b4385392b2209930e20b489a0c9.tar.xz | |
Fix a logic error in app domain creation
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index ad2f12e..23a4cf9 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
| @@ -1025,7 +1025,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
| 1025 | sandbox = AppDomain.CreateDomain( | 1025 | sandbox = AppDomain.CreateDomain( |
| 1026 | m_Scene.RegionInfo.RegionID.ToString(), | 1026 | m_Scene.RegionInfo.RegionID.ToString(), |
| 1027 | evidence, appSetup); | 1027 | evidence, appSetup); |
| 1028 | m_AppDomains[appDomain].AssemblyResolve += | 1028 | sandbox.AssemblyResolve += |
| 1029 | new ResolveEventHandler( | 1029 | new ResolveEventHandler( |
| 1030 | AssemblyResolver.OnAssemblyResolve); | 1030 | AssemblyResolver.OnAssemblyResolve); |
| 1031 | } | 1031 | } |