diff options
author | Justin Clarke Casey | 2008-11-17 21:00:34 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-11-17 21:00:34 +0000 |
commit | c25a0ea7923aa390d30b8eebdbca4e599edf9b0d (patch) | |
tree | 775133790681153be9edc6d640162271750a1fd0 /OpenSim/Region/ScriptEngine/DotNetEngine | |
parent | * minor: add interface version to 'show version' command output (diff) | |
download | opensim-SC-c25a0ea7923aa390d30b8eebdbca4e599edf9b0d.zip opensim-SC-c25a0ea7923aa390d30b8eebdbca4e599edf9b0d.tar.gz opensim-SC-c25a0ea7923aa390d30b8eebdbca4e599edf9b0d.tar.bz2 opensim-SC-c25a0ea7923aa390d30b8eebdbca4e599edf9b0d.tar.xz |
* Update libOMV to r2359. This is necessary for the progressive texture patch
* Update libopenjpeg as well for this patch.
* Appears to be okay on a very short sniff test
* Source code will be placed in opensim-libs shortly
Diffstat (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs index 9cdd006..7931cb2 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs | |||
@@ -29,6 +29,9 @@ using System; | |||
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Reflection; | 31 | using System.Reflection; |
32 | using System.Security; | ||
33 | using System.Security.Policy; | ||
34 | using System.Security.Permissions; | ||
32 | using OpenSim.Region.ScriptEngine.Interfaces; | 35 | using OpenSim.Region.ScriptEngine.Interfaces; |
33 | using OpenSim.Region.ScriptEngine.Shared.ScriptBase; | 36 | using OpenSim.Region.ScriptEngine.Shared.ScriptBase; |
34 | 37 | ||
@@ -132,9 +135,17 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
132 | ads.ConfigurationFile = | 135 | ads.ConfigurationFile = |
133 | AppDomain.CurrentDomain.SetupInformation.ConfigurationFile; | 136 | AppDomain.CurrentDomain.SetupInformation.ConfigurationFile; |
134 | 137 | ||
135 | |||
136 | AppDomain AD = AppDomain.CreateDomain("ScriptAppDomain_" + | 138 | AppDomain AD = AppDomain.CreateDomain("ScriptAppDomain_" + |
137 | AppDomainNameCount, null, ads); | 139 | AppDomainNameCount, null, ads); |
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 | |||
138 | m_scriptEngine.Log.Info("[" + m_scriptEngine.ScriptEngineName + | 149 | m_scriptEngine.Log.Info("[" + m_scriptEngine.ScriptEngineName + |
139 | "]: AppDomain Loading: " + | 150 | "]: AppDomain Loading: " + |
140 | AssemblyName.GetAssemblyName( | 151 | AssemblyName.GetAssemblyName( |