diff options
author | Charles Krinke | 2008-06-27 02:15:57 +0000 |
---|---|---|
committer | Charles Krinke | 2008-06-27 02:15:57 +0000 |
commit | ca8d1d57e1bbf49cb52abe81b3a7246dacbe9b03 (patch) | |
tree | 97f8cce96ea2e98b96b36e523c59361bf00f63b8 /OpenSim/Data | |
parent | Mantis#1610. Thank you, Melanie for a patch that: (diff) | |
download | opensim-SC_OLD-ca8d1d57e1bbf49cb52abe81b3a7246dacbe9b03.zip opensim-SC_OLD-ca8d1d57e1bbf49cb52abe81b3a7246dacbe9b03.tar.gz opensim-SC_OLD-ca8d1d57e1bbf49cb52abe81b3a7246dacbe9b03.tar.bz2 opensim-SC_OLD-ca8d1d57e1bbf49cb52abe81b3a7246dacbe9b03.tar.xz |
Mantis#1591. Thank you graciously, Sempuki for a patch that:
Currently module loading is done ad-hoc. I propose creating a simple
loader class that leverages Mono.Addins (and perhaps the new .NET
addins when they become available in mono). Attached is a basic
patch for review that compiles into HEAD, but doesn't yet replace
any existing ad-hoc loaders.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/AssetDataBase.cs | 1 | ||||
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLAssetData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/MySQLAssetData.cs | 4 | ||||
-rw-r--r-- | OpenSim/Data/NHibernate/NHibernateAssetData.cs | 8 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteAssetData.cs | 2 |
5 files changed, 11 insertions, 6 deletions
diff --git a/OpenSim/Data/AssetDataBase.cs b/OpenSim/Data/AssetDataBase.cs index e3b5c25..ca1de5a 100644 --- a/OpenSim/Data/AssetDataBase.cs +++ b/OpenSim/Data/AssetDataBase.cs | |||
@@ -42,5 +42,6 @@ namespace OpenSim.Data | |||
42 | public abstract string Name { get; } | 42 | public abstract string Name { get; } |
43 | public abstract void Initialise(string connect); | 43 | public abstract void Initialise(string connect); |
44 | public abstract void Initialise(); | 44 | public abstract void Initialise(); |
45 | public abstract void Dispose(); | ||
45 | } | 46 | } |
46 | } | 47 | } |
diff --git a/OpenSim/Data/MSSQL/MSSQLAssetData.cs b/OpenSim/Data/MSSQL/MSSQLAssetData.cs index 50e2e3a..44d78ed 100644 --- a/OpenSim/Data/MSSQL/MSSQLAssetData.cs +++ b/OpenSim/Data/MSSQL/MSSQLAssetData.cs | |||
@@ -218,6 +218,8 @@ namespace OpenSim.Data.MSSQL | |||
218 | 218 | ||
219 | #region IPlugin Members | 219 | #region IPlugin Members |
220 | 220 | ||
221 | override public void Dispose() { } | ||
222 | |||
221 | /// <summary> | 223 | /// <summary> |
222 | /// <para>Initialises asset interface</para> | 224 | /// <para>Initialises asset interface</para> |
223 | /// <para> | 225 | /// <para> |
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs index a64a256..ac7fa1d 100644 --- a/OpenSim/Data/MySQL/MySQLAssetData.cs +++ b/OpenSim/Data/MySQL/MySQLAssetData.cs | |||
@@ -39,7 +39,7 @@ namespace OpenSim.Data.MySQL | |||
39 | /// <summary> | 39 | /// <summary> |
40 | /// A MySQL Interface for the Asset Server | 40 | /// A MySQL Interface for the Asset Server |
41 | /// </summary> | 41 | /// </summary> |
42 | internal class MySQLAssetData : AssetDataBase, IPlugin | 42 | internal class MySQLAssetData : AssetDataBase |
43 | { | 43 | { |
44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
45 | 45 | ||
@@ -109,6 +109,8 @@ namespace OpenSim.Data.MySQL | |||
109 | 109 | ||
110 | } | 110 | } |
111 | 111 | ||
112 | override public void Dispose() { } | ||
113 | |||
112 | #region IAssetProvider Members | 114 | #region IAssetProvider Members |
113 | 115 | ||
114 | /// <summary> | 116 | /// <summary> |
diff --git a/OpenSim/Data/NHibernate/NHibernateAssetData.cs b/OpenSim/Data/NHibernate/NHibernateAssetData.cs index 89f907f..a339ee3 100644 --- a/OpenSim/Data/NHibernate/NHibernateAssetData.cs +++ b/OpenSim/Data/NHibernate/NHibernateAssetData.cs | |||
@@ -43,7 +43,7 @@ namespace OpenSim.Data.NHibernate | |||
43 | /// <summary> | 43 | /// <summary> |
44 | /// A User storage interface for the DB4o database system | 44 | /// A User storage interface for the DB4o database system |
45 | /// </summary> | 45 | /// </summary> |
46 | public class NHibernateAssetData : AssetDataBase, IDisposable | 46 | public class NHibernateAssetData : AssetDataBase |
47 | { | 47 | { |
48 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 48 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
49 | 49 | ||
@@ -51,6 +51,8 @@ namespace OpenSim.Data.NHibernate | |||
51 | private ISessionFactory factory; | 51 | private ISessionFactory factory; |
52 | private ISession session; | 52 | private ISession session; |
53 | 53 | ||
54 | override public void Dispose() { } | ||
55 | |||
54 | public override void Initialise() | 56 | public override void Initialise() |
55 | { | 57 | { |
56 | Initialise("SQLiteDialect;SqliteClientDriver;URI=file:Asset.db,version=3"); | 58 | Initialise("SQLiteDialect;SqliteClientDriver;URI=file:Asset.db,version=3"); |
@@ -173,9 +175,5 @@ namespace OpenSim.Data.NHibernate | |||
173 | get { return "0.1"; } | 175 | get { return "0.1"; } |
174 | } | 176 | } |
175 | 177 | ||
176 | public void Dispose() | ||
177 | { | ||
178 | |||
179 | } | ||
180 | } | 178 | } |
181 | } | 179 | } |
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs index f560b9e..018501f 100644 --- a/OpenSim/Data/SQLite/SQLiteAssetData.cs +++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs | |||
@@ -56,6 +56,8 @@ namespace OpenSim.Data.SQLite | |||
56 | 56 | ||
57 | private SqliteConnection m_conn; | 57 | private SqliteConnection m_conn; |
58 | 58 | ||
59 | override public void Dispose() { } | ||
60 | |||
59 | /// <summary> | 61 | /// <summary> |
60 | /// <list type="bullet"> | 62 | /// <list type="bullet"> |
61 | /// <item>Initialises AssetData interface</item> | 63 | /// <item>Initialises AssetData interface</item> |