aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorFernando Oliveira2013-10-16 20:15:04 -0500
committerfernando2013-10-16 20:16:29 -0500
commit8fdf70b87e51bdd2035f5ab54a335fbb50d79e80 (patch)
treee3c3851c1237072926598964e366cd1105cf005d /OpenSim
parentBulletSim: implement the SL bug where VEHICLE_HOVER_UP_ONLY disables (diff)
downloadopensim-SC_OLD-8fdf70b87e51bdd2035f5ab54a335fbb50d79e80.zip
opensim-SC_OLD-8fdf70b87e51bdd2035f5ab54a335fbb50d79e80.tar.gz
opensim-SC_OLD-8fdf70b87e51bdd2035f5ab54a335fbb50d79e80.tar.bz2
opensim-SC_OLD-8fdf70b87e51bdd2035f5ab54a335fbb50d79e80.tar.xz
* Fixes mantis mantis 0006803 [PGSQL] - Simulator crashes - Mono.Security.dll missing. The root of the issue is that the Postgres driver relies on Mono.Security.dll from the mono project. Unfortunately, when using Mono, including the dll in the distribution causes conflicts. This solution puts Mono.Security.dll in bin/lib/NET/ and, if windows .NET is the runtime, informs the assembly loader to load bin/lib/NET/Mono.Security.dll when .NET is scanning for the Mono.Security namespace. On Mono, the included Mono.Security assembly is ignored.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Data/PGSQL/PGSQLFramework.cs23
-rw-r--r--OpenSim/Data/PGSQL/PGSQLManager.cs24
2 files changed, 47 insertions, 0 deletions
diff --git a/OpenSim/Data/PGSQL/PGSQLFramework.cs b/OpenSim/Data/PGSQL/PGSQLFramework.cs
index 494b0aa..48f8dd3 100644
--- a/OpenSim/Data/PGSQL/PGSQLFramework.cs
+++ b/OpenSim/Data/PGSQL/PGSQLFramework.cs
@@ -29,6 +29,7 @@ using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Data; 31using System.Data;
32using System.Reflection;
32using OpenMetaverse; 33using OpenMetaverse;
33using OpenSim.Framework; 34using OpenSim.Framework;
34using Npgsql; 35using Npgsql;
@@ -50,8 +51,30 @@ namespace OpenSim.Data.PGSQL
50 protected PGSqlFramework(string connectionString) 51 protected PGSqlFramework(string connectionString)
51 { 52 {
52 m_connectionString = connectionString; 53 m_connectionString = connectionString;
54 InitializeMonoSecurity();
53 } 55 }
54 56
57 public void InitializeMonoSecurity()
58 {
59 if (!Util.IsPlatformMono)
60 {
61 AppDomain currentDomain = AppDomain.CurrentDomain;
62 currentDomain.AssemblyResolve += new ResolveEventHandler(ResolveEventHandlerMonoSec);
63 }
64 }
65
66 private System.Reflection.Assembly ResolveEventHandlerMonoSec(object sender, ResolveEventArgs args)
67 {
68 Assembly MyAssembly = null;
69
70 if (args.Name.Substring(0, args.Name.IndexOf(",")) == "Mono.Security")
71 {
72 MyAssembly = Assembly.LoadFrom("lib/NET/Mono.Security.dll");
73 }
74
75 //Return the loaded assembly.
76 return MyAssembly;
77 }
55 ////////////////////////////////////////////////////////////// 78 //////////////////////////////////////////////////////////////
56 // 79 //
57 // All non queries are funneled through one connection 80 // All non queries are funneled through one connection
diff --git a/OpenSim/Data/PGSQL/PGSQLManager.cs b/OpenSim/Data/PGSQL/PGSQLManager.cs
index 3ddaf38..2084fe9 100644
--- a/OpenSim/Data/PGSQL/PGSQLManager.cs
+++ b/OpenSim/Data/PGSQL/PGSQLManager.cs
@@ -30,6 +30,7 @@ using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.IO; 31using System.IO;
32using System.Reflection; 32using System.Reflection;
33using OpenSim.Framework;
33using log4net; 34using log4net;
34using OpenMetaverse; 35using OpenMetaverse;
35using Npgsql; 36using Npgsql;
@@ -56,6 +57,29 @@ namespace OpenSim.Data.PGSQL
56 public PGSQLManager(string connection) 57 public PGSQLManager(string connection)
57 { 58 {
58 connectionString = connection; 59 connectionString = connection;
60 InitializeMonoSecurity();
61 }
62
63 public void InitializeMonoSecurity()
64 {
65 if (!Util.IsPlatformMono)
66 {
67 AppDomain currentDomain = AppDomain.CurrentDomain;
68 currentDomain.AssemblyResolve += new ResolveEventHandler(ResolveEventHandlerMonoSec);
69 }
70 }
71
72 private System.Reflection.Assembly ResolveEventHandlerMonoSec(object sender, ResolveEventArgs args)
73 {
74 Assembly MyAssembly = null;
75
76 if (args.Name.Substring(0, args.Name.IndexOf(",")) == "Mono.Security")
77 {
78 MyAssembly = Assembly.LoadFrom("lib/NET/Mono.Security.dll");
79 }
80
81 //Return the loaded assembly.
82 return MyAssembly;
59 } 83 }
60 84
61 /// <summary> 85 /// <summary>