diff options
author | Melanie Thielker | 2008-11-19 06:15:21 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-11-19 06:15:21 +0000 |
commit | 3234472d6203671a492a73042a0b56d6301903e0 (patch) | |
tree | 2d4c6ef2b21ee24d315e27564b5426cdfe77e9b3 /OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |
parent | Ensure that the physics representation of a deleted object is also removed (diff) | |
download | opensim-SC_OLD-3234472d6203671a492a73042a0b56d6301903e0.zip opensim-SC_OLD-3234472d6203671a492a73042a0b56d6301903e0.tar.gz opensim-SC_OLD-3234472d6203671a492a73042a0b56d6301903e0.tar.bz2 opensim-SC_OLD-3234472d6203671a492a73042a0b56d6301903e0.tar.xz |
Reverting the texture sending patch and the new libOMV. This makes this
release a direct descendant of the stable 7364, with all the features and
none of the issues.
This omits the following patch chain: r7383 r7382 r7381 r7377 r7375 r7373
r7372 r7370 r7369 r7368 r7367 r7366
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 3 |
1 files changed, 1 insertions, 2 deletions
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); |