* 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

2 files changed, 24 insertions, 2 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;
 using System.Collections;
 using System.Collections.Generic;
 using System.Reflection;
+using System.Security;
+using System.Security.Policy;
+using System.Security.Permissions; 
 using OpenSim.Region.ScriptEngine.Interfaces;
 using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
 
@@ -132,9 +135,17 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
             ads.ConfigurationFile =
                     AppDomain.CurrentDomain.SetupInformation.ConfigurationFile;
 
-
             AppDomain AD = AppDomain.CreateDomain("ScriptAppDomain_" +
                     AppDomainNameCount, null, ads);
+
+            PolicyLevel sandboxPolicy = PolicyLevel.CreateAppDomainLevel();
+            AllMembershipCondition sandboxMembershipCondition = new AllMembershipCondition();
+            PermissionSet sandboxPermissionSet = sandboxPolicy.GetNamedPermissionSet("Internet");
+            PolicyStatement sandboxPolicyStatement = new PolicyStatement(sandboxPermissionSet);
+            CodeGroup sandboxCodeGroup = new UnionCodeGroup(sandboxMembershipCondition, sandboxPolicyStatement);
+            sandboxPolicy.RootCodeGroup = sandboxCodeGroup;
+            AD.SetAppDomainPolicy(sandboxPolicy);
+
             m_scriptEngine.Log.Info("[" + m_scriptEngine.ScriptEngineName +
                     "]: AppDomain Loading: " +
                     AssemblyName.GetAssemblyName(
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;
 using System.Threading;
 using System.Collections;
 using System.Collections.Generic;
+using System.Security;
 using System.Security.Policy;
 using System.Reflection;
 using System.Globalization;
@@ -536,11 +537,21 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                             Evidence baseEvidence = AppDomain.CurrentDomain.Evidence;
                             Evidence evidence = new Evidence(baseEvidence);
 
-                            m_AppDomains[appDomain] =
+                            AppDomain sandbox =
                                 AppDomain.CreateDomain(
                                     m_Scene.RegionInfo.RegionID.ToString(),
                                     evidence, appSetup);
 
+                            PolicyLevel sandboxPolicy = PolicyLevel.CreateAppDomainLevel();
+                            AllMembershipCondition sandboxMembershipCondition = new AllMembershipCondition();
+                            PermissionSet sandboxPermissionSet = sandboxPolicy.GetNamedPermissionSet("Internet");
+                            PolicyStatement sandboxPolicyStatement = new PolicyStatement(sandboxPermissionSet);
+                            CodeGroup sandboxCodeGroup = new UnionCodeGroup(sandboxMembershipCondition, sandboxPolicyStatement);
+                            sandboxPolicy.RootCodeGroup = sandboxCodeGroup;
+                            sandbox.SetAppDomainPolicy(sandboxPolicy);
+
+                            m_AppDomains[appDomain] = sandbox;
+
                             m_AppDomains[appDomain].AssemblyResolve +=
                                 new ResolveEventHandler(
                                     AssemblyResolver.OnAssemblyResolve);