aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-17 21:36:12 +0000
committerJustin Clarke Casey2008-11-17 21:36:12 +0000
commit93b18d73234c3117fddc1a6023c3cc073de0571d (patch)
treed5af1591f1633a210334e9af89da385862f22c7e
parent* Remove old unused libsecondlife and openjpeg libraries (diff)
downloadopensim-SC_OLD-93b18d73234c3117fddc1a6023c3cc073de0571d.zip
opensim-SC_OLD-93b18d73234c3117fddc1a6023c3cc073de0571d.tar.gz
opensim-SC_OLD-93b18d73234c3117fddc1a6023c3cc073de0571d.tar.bz2
opensim-SC_OLD-93b18d73234c3117fddc1a6023c3cc073de0571d.tar.xz
* Remove Appdomain code in XEngine.cs
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs14
1 files changed, 2 insertions, 12 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 5d5e975..98d4f3b 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -537,21 +537,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine
537 Evidence baseEvidence = AppDomain.CurrentDomain.Evidence; 537 Evidence baseEvidence = AppDomain.CurrentDomain.Evidence;
538 Evidence evidence = new Evidence(baseEvidence); 538 Evidence evidence = new Evidence(baseEvidence);
539 539
540 AppDomain sandbox = 540 m_AppDomains[appDomain] =
541 AppDomain.CreateDomain( 541 AppDomain.CreateDomain(
542 m_Scene.RegionInfo.RegionID.ToString(), 542 m_Scene.RegionInfo.RegionID.ToString(),
543 evidence, appSetup); 543 evidence, appSetup);
544 544
545 PolicyLevel sandboxPolicy = PolicyLevel.CreateAppDomainLevel();
546 AllMembershipCondition sandboxMembershipCondition = new AllMembershipCondition();
547 PermissionSet sandboxPermissionSet = sandboxPolicy.GetNamedPermissionSet("Internet");
548 PolicyStatement sandboxPolicyStatement = new PolicyStatement(sandboxPermissionSet);
549 CodeGroup sandboxCodeGroup = new UnionCodeGroup(sandboxMembershipCondition, sandboxPolicyStatement);
550 sandboxPolicy.RootCodeGroup = sandboxCodeGroup;
551 sandbox.SetAppDomainPolicy(sandboxPolicy);
552
553 m_AppDomains[appDomain] = sandbox;
554
555 m_AppDomains[appDomain].AssemblyResolve += 545 m_AppDomains[appDomain].AssemblyResolve +=
556 new ResolveEventHandler( 546 new ResolveEventHandler(
557 AssemblyResolver.OnAssemblyResolve); 547 AssemblyResolver.OnAssemblyResolve);