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

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;
 using System.Collections;
 using System.Collections.Generic;
 using System.Reflection;
-using System.Security;
-using System.Security.Policy;
-using System.Security.Permissions; 
 using OpenSim.Region.ScriptEngine.Interfaces;
 using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
 
@@ -135,9 +132,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
             ads.ConfigurationFile =
                     AppDomain.CurrentDomain.SetupInformation.ConfigurationFile;
 
+
             AppDomain AD = AppDomain.CreateDomain("ScriptAppDomain_" +
                     AppDomainNameCount, null, ads);
-
             m_scriptEngine.Log.Info("[" + m_scriptEngine.ScriptEngineName +
                     "]: AppDomain Loading: " +
                     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;
 using System.Threading;
 using System.Collections;
 using System.Collections.Generic;
-using System.Security;
 using System.Security.Policy;
 using System.Reflection;
 using System.Globalization;
@@ -541,7 +540,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                                 AppDomain.CreateDomain(
                                     m_Scene.RegionInfo.RegionID.ToString(),
                                     evidence, appSetup);
-                            
+
                             m_AppDomains[appDomain].AssemblyResolve +=
                                 new ResolveEventHandler(
                                     AssemblyResolver.OnAssemblyResolve);