aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite/SQLiteAssetData.cs
diff options
context:
space:
mode:
authorMarck2011-06-30 20:05:02 +0200
committerMarck2011-07-16 09:49:38 +0200
commitdd2564d7ecd4fa628daaacfd612c1a8c3e0ef309 (patch)
tree8692f848f8ee55db8745c2f975bdbadf29fddb1c /OpenSim/Data/SQLite/SQLiteAssetData.cs
parentReplace ifs in SOG.GroupResize() with Math.Min() (diff)
downloadopensim-SC_OLD-dd2564d7ecd4fa628daaacfd612c1a8c3e0ef309.zip
opensim-SC_OLD-dd2564d7ecd4fa628daaacfd612c1a8c3e0ef309.tar.gz
opensim-SC_OLD-dd2564d7ecd4fa628daaacfd612c1a8c3e0ef309.tar.bz2
opensim-SC_OLD-dd2564d7ecd4fa628daaacfd612c1a8c3e0ef309.tar.xz
refactor: Pull up Assembly of the SQLite classes as a protected property, so that it can be overwritten in subclasses. That way extensions can decide in which assembly migration resources should be looked up. This is a refactor similar to commit 9923a2ff1002d722ccebea8bf4d71718ed4e2a03 for MySQL -- no functional changes.
Diffstat (limited to 'OpenSim/Data/SQLite/SQLiteAssetData.cs')
-rw-r--r--OpenSim/Data/SQLite/SQLiteAssetData.cs8
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index 5b71897..bb23fc1 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -57,6 +57,11 @@ namespace OpenSim.Data.SQLite
57 57
58 private SqliteConnection m_conn; 58 private SqliteConnection m_conn;
59 59
60 protected virtual Assembly Assembly
61 {
62 get { return GetType().Assembly; }
63 }
64
60 override public void Dispose() 65 override public void Dispose()
61 { 66 {
62 if (m_conn != null) 67 if (m_conn != null)
@@ -83,8 +88,7 @@ namespace OpenSim.Data.SQLite
83 m_conn = new SqliteConnection(dbconnect); 88 m_conn = new SqliteConnection(dbconnect);
84 m_conn.Open(); 89 m_conn.Open();
85 90
86 Assembly assem = GetType().Assembly; 91 Migration m = new Migration(m_conn, Assembly, "AssetStore");
87 Migration m = new Migration(m_conn, assem, "AssetStore");
88 m.Update(); 92 m.Update();
89 93
90 return; 94 return;