Merge branch 'master' of /home/opensim/var/repo/opensim
commit
3d6f9f9cec
|
@ -1025,7 +1025,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
|
||||||
sandbox = AppDomain.CreateDomain(
|
sandbox = AppDomain.CreateDomain(
|
||||||
m_Scene.RegionInfo.RegionID.ToString(),
|
m_Scene.RegionInfo.RegionID.ToString(),
|
||||||
evidence, appSetup);
|
evidence, appSetup);
|
||||||
m_AppDomains[appDomain].AssemblyResolve +=
|
sandbox.AssemblyResolve +=
|
||||||
new ResolveEventHandler(
|
new ResolveEventHandler(
|
||||||
AssemblyResolver.OnAssemblyResolve);
|
AssemblyResolver.OnAssemblyResolve);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue