ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 00:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Reverting the texture sending patch and the new libOMV. This makes this

Browse Source 
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
This commit is contained in:
Melanie Thielker
2008-11-19 06:15:21 +00:00
parent 44a94055a4
commit 3234472d62
73 changed files with 589 additions and 705 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs
View File

@@ -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(

3
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
View File

@@ -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);