aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/XEngine
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/XEngine
parentReverting the texture sending patch and the new libOMV. This makes this (diff)
downloadopensim-SC-f518ca7feb33c0c1641ccb8f3956246b855f9b6c.zip
opensim-SC-f518ca7feb33c0c1641ccb8f3956246b855f9b6c.tar.gz
opensim-SC-f518ca7feb33c0c1641ccb8f3956246b855f9b6c.tar.bz2
opensim-SC-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.cs3
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;
30using System.Threading; 30using System.Threading;
31using System.Collections; 31using System.Collections;
32using System.Collections.Generic; 32using System.Collections.Generic;
33using System.Security;
33using System.Security.Policy; 34using System.Security.Policy;
34using System.Reflection; 35using System.Reflection;
35using System.Globalization; 36using 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);