aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
diff options
context:
space:
mode:
authorJohn Hurliman2009-10-29 05:56:37 -0700
committerJohn Hurliman2009-10-29 05:56:37 -0700
commitdd13fa361b12fa2fb1c91c9f74379a305935a87d (patch)
treeff4c2e2d4eef64d20d09a3ccfb002b5d23396209 /OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
parentOptimizations (diff)
downloadopensim-SC_OLD-dd13fa361b12fa2fb1c91c9f74379a305935a87d.zip
opensim-SC_OLD-dd13fa361b12fa2fb1c91c9f74379a305935a87d.tar.gz
opensim-SC_OLD-dd13fa361b12fa2fb1c91c9f74379a305935a87d.tar.bz2
opensim-SC_OLD-dd13fa361b12fa2fb1c91c9f74379a305935a87d.tar.xz
* Misc. formatting cleanup for the previous patch
* Added the new AppDomainLoading variable to the [XEngine] section in the example config
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine/XEngine.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs18
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 57042e9..b13e0de 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -710,15 +710,15 @@ namespace OpenSim.Region.ScriptEngine.XEngine
710 evidence, appSetup); 710 evidence, appSetup);
711 else 711 else
712 sandbox = AppDomain.CurrentDomain; 712 sandbox = AppDomain.CurrentDomain;
713 /* 713
714 PolicyLevel sandboxPolicy = PolicyLevel.CreateAppDomainLevel(); 714 //PolicyLevel sandboxPolicy = PolicyLevel.CreateAppDomainLevel();
715 AllMembershipCondition sandboxMembershipCondition = new AllMembershipCondition(); 715 //AllMembershipCondition sandboxMembershipCondition = new AllMembershipCondition();
716 PermissionSet sandboxPermissionSet = sandboxPolicy.GetNamedPermissionSet("Internet"); 716 //PermissionSet sandboxPermissionSet = sandboxPolicy.GetNamedPermissionSet("Internet");
717 PolicyStatement sandboxPolicyStatement = new PolicyStatement(sandboxPermissionSet); 717 //PolicyStatement sandboxPolicyStatement = new PolicyStatement(sandboxPermissionSet);
718 CodeGroup sandboxCodeGroup = new UnionCodeGroup(sandboxMembershipCondition, sandboxPolicyStatement); 718 //CodeGroup sandboxCodeGroup = new UnionCodeGroup(sandboxMembershipCondition, sandboxPolicyStatement);
719 sandboxPolicy.RootCodeGroup = sandboxCodeGroup; 719 //sandboxPolicy.RootCodeGroup = sandboxCodeGroup;
720 sandbox.SetAppDomainPolicy(sandboxPolicy); 720 //sandbox.SetAppDomainPolicy(sandboxPolicy);
721 */ 721
722 m_AppDomains[appDomain] = sandbox; 722 m_AppDomains[appDomain] = sandbox;
723 723
724 m_AppDomains[appDomain].AssemblyResolve += 724 m_AppDomains[appDomain].AssemblyResolve +=