aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite/SQLiteEstateData.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-07-18 01:35:00 +0100
committerJustin Clark-Casey (justincc)2011-07-18 01:35:00 +0100
commitbdd340b9fc9c7935e4c6e3062759d49ffb92c871 (patch)
tree3728f6058b0d02ce3e1050efaeb5f23b8884baae /OpenSim/Data/SQLite/SQLiteEstateData.cs
parentrefactor: group all the undo/redo code in SOP into one place for easier code ... (diff)
parentrefactor: Pull up Assembly of the SQLite classes as a protected property, so ... (diff)
downloadopensim-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 'OpenSim/Data/SQLite/SQLiteEstateData.cs')
-rw-r--r--OpenSim/Data/SQLite/SQLiteEstateData.cs8
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteEstateData.cs b/OpenSim/Data/SQLite/SQLiteEstateData.cs
index 2f05a6e..65719a6 100644
--- a/OpenSim/Data/SQLite/SQLiteEstateData.cs
+++ b/OpenSim/Data/SQLite/SQLiteEstateData.cs
@@ -53,6 +53,11 @@ namespace OpenSim.Data.SQLite
53 private Dictionary<string, FieldInfo> m_FieldMap = 53 private Dictionary<string, FieldInfo> m_FieldMap =
54 new Dictionary<string, FieldInfo>(); 54 new Dictionary<string, FieldInfo>();
55 55
56 protected virtual Assembly Assembly
57 {
58 get { return GetType().Assembly; }
59 }
60
56 public SQLiteEstateStore() 61 public SQLiteEstateStore()
57 { 62 {
58 } 63 }
@@ -71,8 +76,7 @@ namespace OpenSim.Data.SQLite
71 m_connection = new SqliteConnection(m_connectionString); 76 m_connection = new SqliteConnection(m_connectionString);
72 m_connection.Open(); 77 m_connection.Open();
73 78
74 Assembly assem = GetType().Assembly; 79 Migration m = new Migration(m_connection, Assembly, "EstateStore");
75 Migration m = new Migration(m_connection, assem, "EstateStore");
76 m.Update(); 80 m.Update();
77 81
78 //m_connection.Close(); 82 //m_connection.Close();