diff --git a/OpenSim/Data/PGSQL/PGSQLFramework.cs b/OpenSim/Data/PGSQL/PGSQLFramework.cs index 1028e4ea86..ddc136a0f3 100644 --- a/OpenSim/Data/PGSQL/PGSQLFramework.cs +++ b/OpenSim/Data/PGSQL/PGSQLFramework.cs @@ -51,36 +51,8 @@ namespace OpenSim.Data.PGSQL protected PGSqlFramework(string connectionString) { m_connectionString = connectionString; - InitializeMonoSecurity(); } - public void InitializeMonoSecurity() - { - if (!Util.IsPlatformMono) - { - - if (AppDomain.CurrentDomain.GetData("MonoSecurityPostgresAdded") == null) - { - AppDomain.CurrentDomain.SetData("MonoSecurityPostgresAdded", "true"); - - AppDomain currentDomain = AppDomain.CurrentDomain; - currentDomain.AssemblyResolve += new ResolveEventHandler(ResolveEventHandlerMonoSec); - } - } - } - - private System.Reflection.Assembly ResolveEventHandlerMonoSec(object sender, ResolveEventArgs args) - { - Assembly MyAssembly = null; - - if (args.Name.Substring(0, args.Name.IndexOf(",")) == "Mono.Security") - { - MyAssembly = Assembly.LoadFrom("lib/NET/Mono.Security.dll"); - } - - //Return the loaded assembly. - return MyAssembly; - } ////////////////////////////////////////////////////////////// // // All non queries are funneled through one connection diff --git a/OpenSim/Data/PGSQL/PGSQLManager.cs b/OpenSim/Data/PGSQL/PGSQLManager.cs index 0f565adbe8..183704b141 100644 --- a/OpenSim/Data/PGSQL/PGSQLManager.cs +++ b/OpenSim/Data/PGSQL/PGSQLManager.cs @@ -43,7 +43,7 @@ namespace OpenSim.Data.PGSQL /// public class PGSQLManager { -// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); /// /// Connection string for ADO.net @@ -57,34 +57,6 @@ namespace OpenSim.Data.PGSQL public PGSQLManager(string connection) { connectionString = connection; - InitializeMonoSecurity(); - } - - public void InitializeMonoSecurity() - { - if (!Util.IsPlatformMono) - { - if (AppDomain.CurrentDomain.GetData("MonoSecurityPostgresAdded") == null) - { - AppDomain.CurrentDomain.SetData("MonoSecurityPostgresAdded", "true"); - - AppDomain currentDomain = AppDomain.CurrentDomain; - currentDomain.AssemblyResolve += new ResolveEventHandler(ResolveEventHandlerMonoSec); - } - } - } - - private System.Reflection.Assembly ResolveEventHandlerMonoSec(object sender, ResolveEventArgs args) - { - Assembly MyAssembly = null; - - if (args.Name.Substring(0, args.Name.IndexOf(",")) == "Mono.Security") - { - MyAssembly = Assembly.LoadFrom("lib/NET/Mono.Security.dll"); - } - - //Return the loaded assembly. - return MyAssembly; } /// diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs index c86a5eb5ce..5d45372d69 100644 --- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs +++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs @@ -628,7 +628,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest Status = (int)response.StatusCode; byte[] buf = new byte[HttpBodyMaxLenMAX + 16]; - int count = 0; + int count; resStream = response.GetResponseStream(); int totalBodyBytes = 0; diff --git a/bin/lib/NET/Mono.Security.dll b/bin/lib/NET/Mono.Security.dll deleted file mode 100644 index 1371f5cb63..0000000000 Binary files a/bin/lib/NET/Mono.Security.dll and /dev/null differ