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/XEngine | |
parent | * minor: add interface version to 'show version' command output (diff) | |
download | opensim-SC_OLD-c25a0ea7923aa390d30b8eebdbca4e599edf9b0d.zip opensim-SC_OLD-c25a0ea7923aa390d30b8eebdbca4e599edf9b0d.tar.gz opensim-SC_OLD-c25a0ea7923aa390d30b8eebdbca4e599edf9b0d.tar.bz2 opensim-SC_OLD-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 '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index e5dfb2b..5d5e975 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -30,6 +30,7 @@ using System.IO; | |||
30 | using System.Threading; | 30 | using System.Threading; |
31 | using System.Collections; | 31 | using System.Collections; |
32 | using System.Collections.Generic; | 32 | using System.Collections.Generic; |
33 | using System.Security; | ||
33 | using System.Security.Policy; | 34 | using System.Security.Policy; |
34 | using System.Reflection; | 35 | using System.Reflection; |
35 | using System.Globalization; | 36 | using System.Globalization; |
@@ -536,11 +537,21 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
536 | Evidence baseEvidence = AppDomain.CurrentDomain.Evidence; | 537 | Evidence baseEvidence = AppDomain.CurrentDomain.Evidence; |
537 | Evidence evidence = new Evidence(baseEvidence); | 538 | Evidence evidence = new Evidence(baseEvidence); |
538 | 539 | ||
539 | m_AppDomains[appDomain] = | 540 | AppDomain sandbox = |
540 | AppDomain.CreateDomain( | 541 | AppDomain.CreateDomain( |
541 | m_Scene.RegionInfo.RegionID.ToString(), | 542 | m_Scene.RegionInfo.RegionID.ToString(), |
542 | evidence, appSetup); | 543 | evidence, appSetup); |
543 | 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 | |||
544 | m_AppDomains[appDomain].AssemblyResolve += | 555 | m_AppDomains[appDomain].AssemblyResolve += |
545 | new ResolveEventHandler( | 556 | new ResolveEventHandler( |
546 | AssemblyResolver.OnAssemblyResolve); | 557 | AssemblyResolver.OnAssemblyResolve); |