aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs
diff options
context:
space:
mode:
authorMelanie Thielker2008-11-19 06:25:34 +0000
committerMelanie Thielker2008-11-19 06:25:34 +0000
commitf518ca7feb33c0c1641ccb8f3956246b855f9b6c (patch)
tree8dafdff97f14290b259bb04a03c5e7bb98756c24 /OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs
parentReverting the texture sending patch and the new libOMV. This makes this (diff)
downloadopensim-SC_OLD-f518ca7feb33c0c1641ccb8f3956246b855f9b6c.zip
opensim-SC_OLD-f518ca7feb33c0c1641ccb8f3956246b855f9b6c.tar.gz
opensim-SC_OLD-f518ca7feb33c0c1641ccb8f3956246b855f9b6c.tar.bz2
opensim-SC_OLD-f518ca7feb33c0c1641ccb8f3956246b855f9b6c.tar.xz
Reapply r7369 r7367 r7366 r7370 r7381. This brings it back up to the new
libOMV.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs5
1 files changed, 4 insertions, 1 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;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection; 31using System.Reflection;
32using System.Security;
33using System.Security.Policy;
34using System.Security.Permissions;
32using OpenSim.Region.ScriptEngine.Interfaces; 35using OpenSim.Region.ScriptEngine.Interfaces;
33using OpenSim.Region.ScriptEngine.Shared.ScriptBase; 36using 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(