diff options
author | Melanie Thielker | 2008-11-19 06:25:34 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-11-19 06:25:34 +0000 |
commit | f518ca7feb33c0c1641ccb8f3956246b855f9b6c (patch) | |
tree | 8dafdff97f14290b259bb04a03c5e7bb98756c24 /OpenSim/Region/ScriptEngine/XEngine | |
parent | Reverting the texture sending patch and the new libOMV. This makes this (diff) | |
download | opensim-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/XEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 3 |
1 files changed, 2 insertions, 1 deletions
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); |