diff options
author | Justin Clark-Casey (justincc) | 2011-07-18 01:35:00 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-07-18 01:35:00 +0100 |
commit | bdd340b9fc9c7935e4c6e3062759d49ffb92c871 (patch) | |
tree | 3728f6058b0d02ce3e1050efaeb5f23b8884baae /OpenSim/Data/SQLite/SQLiteAssetData.cs | |
parent | refactor: group all the undo/redo code in SOP into one place for easier code ... (diff) | |
parent | refactor: Pull up Assembly of the SQLite classes as a protected property, so ... (diff) | |
download | opensim-SC_OLD-bdd340b9fc9c7935e4c6e3062759d49ffb92c871.zip opensim-SC_OLD-bdd340b9fc9c7935e4c6e3062759d49ffb92c871.tar.gz opensim-SC_OLD-bdd340b9fc9c7935e4c6e3062759d49ffb92c871.tar.bz2 opensim-SC_OLD-bdd340b9fc9c7935e4c6e3062759d49ffb92c871.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteAssetData.cs | 8 |
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; |