aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs
diff options
context:
space:
mode:
authorDan Lake2011-07-20 15:01:32 -0700
committerDan Lake2011-07-20 15:01:32 -0700
commit2c11f7fc38ba14e041ed0e648088d574dadaaffe (patch)
treed593e3d1130e78ec74a11650d413f451a9a844da /OpenSim/Data/SQLite/SQLiteAuthenticationData.cs
parentMerge branch 'master' into bulletsim (diff)
parentRemoved unused AddPrimShape methods in PhysicsScene caused by merge conflicts (diff)
downloadopensim-SC-2c11f7fc38ba14e041ed0e648088d574dadaaffe.zip
opensim-SC-2c11f7fc38ba14e041ed0e648088d574dadaaffe.tar.gz
opensim-SC-2c11f7fc38ba14e041ed0e648088d574dadaaffe.tar.bz2
opensim-SC-2c11f7fc38ba14e041ed0e648088d574dadaaffe.tar.xz
Merge branch 'master' into bulletsim
Diffstat (limited to 'OpenSim/Data/SQLite/SQLiteAuthenticationData.cs')
-rw-r--r--OpenSim/Data/SQLite/SQLiteAuthenticationData.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs b/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs
index c3b65bb..f51aa28 100644
--- a/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs
@@ -53,6 +53,11 @@ namespace OpenSim.Data.SQLite
53 protected static SqliteConnection m_Connection; 53 protected static SqliteConnection m_Connection;
54 private static bool m_initialized = false; 54 private static bool m_initialized = false;
55 55
56 protected virtual Assembly Assembly
57 {
58 get { return GetType().Assembly; }
59 }
60
56 public SQLiteAuthenticationData(string connectionString, string realm) 61 public SQLiteAuthenticationData(string connectionString, string realm)
57 : base(connectionString) 62 : base(connectionString)
58 { 63 {
@@ -63,7 +68,7 @@ namespace OpenSim.Data.SQLite
63 m_Connection = new SqliteConnection(connectionString); 68 m_Connection = new SqliteConnection(connectionString);
64 m_Connection.Open(); 69 m_Connection.Open();
65 70
66 Migration m = new Migration(m_Connection, GetType().Assembly, "AuthStore"); 71 Migration m = new Migration(m_Connection, Assembly, "AuthStore");
67 m.Update(); 72 m.Update();
68 73
69 m_initialized = true; 74 m_initialized = true;