aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie Thielker2008-11-18 18:14:15 +0000
committerMelanie Thielker2008-11-18 18:14:15 +0000
commit18b6250f40d66f7b66487f9f28bd451bdac270e6 (patch)
treef8be07c3c0b6dc2add8a15c5e9f3df10c6a4d9b9 /OpenSim/Region
parentPrevent a nullref when building new prims while others watch (diff)
downloadopensim-SC_OLD-18b6250f40d66f7b66487f9f28bd451bdac270e6.zip
opensim-SC_OLD-18b6250f40d66f7b66487f9f28bd451bdac270e6.tar.gz
opensim-SC_OLD-18b6250f40d66f7b66487f9f28bd451bdac270e6.tar.bz2
opensim-SC_OLD-18b6250f40d66f7b66487f9f28bd451bdac270e6.tar.xz
Remove perts of jhurliman's AD security patch that had slipped in
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs8
1 files changed, 0 insertions, 8 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs
index 7931cb2..eeca143 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs
@@ -138,14 +138,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
138 AppDomain AD = AppDomain.CreateDomain("ScriptAppDomain_" + 138 AppDomain AD = AppDomain.CreateDomain("ScriptAppDomain_" +
139 AppDomainNameCount, null, ads); 139 AppDomainNameCount, null, ads);
140 140
141 PolicyLevel sandboxPolicy = PolicyLevel.CreateAppDomainLevel();
142 AllMembershipCondition sandboxMembershipCondition = new AllMembershipCondition();
143 PermissionSet sandboxPermissionSet = sandboxPolicy.GetNamedPermissionSet("Internet");
144 PolicyStatement sandboxPolicyStatement = new PolicyStatement(sandboxPermissionSet);
145 CodeGroup sandboxCodeGroup = new UnionCodeGroup(sandboxMembershipCondition, sandboxPolicyStatement);
146 sandboxPolicy.RootCodeGroup = sandboxCodeGroup;
147 AD.SetAppDomainPolicy(sandboxPolicy);
148
149 m_scriptEngine.Log.Info("[" + m_scriptEngine.ScriptEngineName + 141 m_scriptEngine.Log.Info("[" + m_scriptEngine.ScriptEngineName +
150 "]: AppDomain Loading: " + 142 "]: AppDomain Loading: " +
151 AssemblyName.GetAssemblyName( 143 AssemblyName.GetAssemblyName(