Merge branch 'master' of /home/opensim/var/repo/opensim

integration
BlueWall 2012-04-18 20:02:48 -04:00
commit 3d6f9f9cec
1 changed files with 1 additions and 1 deletions

View File

@ -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);
} }