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, 2 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs index eeca143..9cdd006 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs | |||
@@ -29,9 +29,6 @@ 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; | ||
35 | using OpenSim.Region.ScriptEngine.Interfaces; | 32 | using OpenSim.Region.ScriptEngine.Interfaces; |
36 | using OpenSim.Region.ScriptEngine.Shared.ScriptBase; | 33 | using OpenSim.Region.ScriptEngine.Shared.ScriptBase; |
37 | 34 | ||
@@ -135,9 +132,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
135 | ads.ConfigurationFile = | 132 | ads.ConfigurationFile = |
136 | AppDomain.CurrentDomain.SetupInformation.ConfigurationFile; | 133 | AppDomain.CurrentDomain.SetupInformation.ConfigurationFile; |
137 | 134 | ||
135 | |||
138 | AppDomain AD = AppDomain.CreateDomain("ScriptAppDomain_" + | 136 | AppDomain AD = AppDomain.CreateDomain("ScriptAppDomain_" + |
139 | AppDomainNameCount, null, ads); | 137 | AppDomainNameCount, null, ads); |
140 | |||
141 | m_scriptEngine.Log.Info("[" + m_scriptEngine.ScriptEngineName + | 138 | m_scriptEngine.Log.Info("[" + m_scriptEngine.ScriptEngineName + |
142 | "]: AppDomain Loading: " + | 139 | "]: AppDomain Loading: " + |
143 | AssemblyName.GetAssemblyName( | 140 | AssemblyName.GetAssemblyName( |
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 98d4f3b..e5dfb2b 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -30,7 +30,6 @@ 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; | ||
34 | using System.Security.Policy; | 33 | using System.Security.Policy; |
35 | using System.Reflection; | 34 | using System.Reflection; |
36 | using System.Globalization; | 35 | using System.Globalization; |
@@ -541,7 +540,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
541 | AppDomain.CreateDomain( | 540 | AppDomain.CreateDomain( |
542 | m_Scene.RegionInfo.RegionID.ToString(), | 541 | m_Scene.RegionInfo.RegionID.ToString(), |
543 | evidence, appSetup); | 542 | evidence, appSetup); |
544 | 543 | ||
545 | m_AppDomains[appDomain].AssemblyResolve += | 544 | m_AppDomains[appDomain].AssemblyResolve += |
546 | new ResolveEventHandler( | 545 | new ResolveEventHandler( |
547 | AssemblyResolver.OnAssemblyResolve); | 546 | AssemblyResolver.OnAssemblyResolve); |