diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs index 9cdd006..eeca143 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,9 @@ 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 | |||
138 | m_scriptEngine.Log.Info("[" + m_scriptEngine.ScriptEngineName + | 141 | m_scriptEngine.Log.Info("[" + m_scriptEngine.ScriptEngineName + |
139 | "]: AppDomain Loading: " + | 142 | "]: AppDomain Loading: " + |
140 | AssemblyName.GetAssemblyName( | 143 | AssemblyName.GetAssemblyName( |
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index e5dfb2b..98d4f3b 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; |
@@ -540,7 +541,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
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 | ||
544 | m_AppDomains[appDomain].AssemblyResolve += | 545 | m_AppDomains[appDomain].AssemblyResolve += |
545 | new ResolveEventHandler( | 546 | new ResolveEventHandler( |
546 | AssemblyResolver.OnAssemblyResolve); | 547 | AssemblyResolver.OnAssemblyResolve); |