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/DotNetEngine | |
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 'OpenSim/Region/ScriptEngine/DotNetEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs | 5 |
1 files changed, 1 insertions, 4 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; | |||
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Reflection; | 31 | using System.Reflection; |
32 | using System.Security; | ||
33 | using System.Security.Policy; | ||
34 | using System.Security.Permissions; | ||
35 | using OpenSim.Region.ScriptEngine.Interfaces; | 32 | using OpenSim.Region.ScriptEngine.Interfaces; |
36 | using OpenSim.Region.ScriptEngine.Shared.ScriptBase; | 33 | using OpenSim.Region.ScriptEngine.Shared.ScriptBase; |
37 | 34 | ||
@@ -135,9 +132,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
135 | ads.ConfigurationFile = | 132 | ads.ConfigurationFile = |
136 | AppDomain.CurrentDomain.SetupInformation.ConfigurationFile; | 133 | AppDomain.CurrentDomain.SetupInformation.ConfigurationFile; |
137 | 134 | ||
135 | |||
138 | AppDomain AD = AppDomain.CreateDomain("ScriptAppDomain_" + | 136 | AppDomain AD = AppDomain.CreateDomain("ScriptAppDomain_" + |
139 | AppDomainNameCount, null, ads); | 137 | AppDomainNameCount, null, ads); |
140 | |||
141 | m_scriptEngine.Log.Info("[" + m_scriptEngine.ScriptEngineName + | 138 | m_scriptEngine.Log.Info("[" + m_scriptEngine.ScriptEngineName + |
142 | "]: AppDomain Loading: " + | 139 | "]: AppDomain Loading: " + |
143 | AssemblyName.GetAssemblyName( | 140 | AssemblyName.GetAssemblyName( |