aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite/SQLiteGenericTableHandler.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/SQLiteGenericTableHandler.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/SQLiteGenericTableHandler.cs')
-rw-r--r--OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs10
1 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs b/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
index 0d7ae1f..4f977a8 100644
--- a/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
+++ b/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
@@ -55,6 +55,11 @@ namespace OpenSim.Data.SQLite
55 protected static SqliteConnection m_Connection; 55 protected static SqliteConnection m_Connection;
56 private static bool m_initialized; 56 private static bool m_initialized;
57 57
58 protected virtual Assembly Assembly
59 {
60 get { return GetType().Assembly; }
61 }
62
58 public SQLiteGenericTableHandler(string connectionString, 63 public SQLiteGenericTableHandler(string connectionString,
59 string realm, string storeName) : base(connectionString) 64 string realm, string storeName) : base(connectionString)
60 { 65 {
@@ -68,13 +73,12 @@ namespace OpenSim.Data.SQLite
68 73
69 if (storeName != String.Empty) 74 if (storeName != String.Empty)
70 { 75 {
71 Assembly assem = GetType().Assembly;
72 //SqliteConnection newConnection = 76 //SqliteConnection newConnection =
73 // (SqliteConnection)((ICloneable)m_Connection).Clone(); 77 // (SqliteConnection)((ICloneable)m_Connection).Clone();
74 //newConnection.Open(); 78 //newConnection.Open();
75 79
76 //Migration m = new Migration(newConnection, assem, storeName); 80 //Migration m = new Migration(newConnection, Assembly, storeName);
77 Migration m = new Migration(m_Connection, assem, storeName); 81 Migration m = new Migration(m_Connection, Assembly, storeName);
78 m.Update(); 82 m.Update();
79 //newConnection.Close(); 83 //newConnection.Close();
80 //newConnection.Dispose(); 84 //newConnection.Dispose();