diff options
author | Sean McNamara | 2011-04-10 18:28:54 -0400 |
---|---|---|
committer | Sean McNamara | 2011-04-10 18:28:54 -0400 |
commit | 9c0f3c73b1fd56ac145e866af0316a3285ddb689 (patch) | |
tree | 03541a853c2ecf5829ac296537b14d4553ad4b2e /OpenSim/Data/MySQL/MySQLAuthenticationData.cs | |
parent | Merge git://opensimulator.org/git/opensim (diff) | |
parent | minor: remove mono compiler warnings (diff) | |
download | opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.zip opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.tar.gz opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.tar.bz2 opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.tar.xz |
Merge git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLAuthenticationData.cs')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLAuthenticationData.cs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Data/MySQL/MySQLAuthenticationData.cs b/OpenSim/Data/MySQL/MySQLAuthenticationData.cs index 5056aee..8d82f61 100644 --- a/OpenSim/Data/MySQL/MySQLAuthenticationData.cs +++ b/OpenSim/Data/MySQL/MySQLAuthenticationData.cs | |||
@@ -28,6 +28,7 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Reflection; | ||
31 | using System.Data; | 32 | using System.Data; |
32 | using OpenMetaverse; | 33 | using OpenMetaverse; |
33 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
@@ -42,6 +43,11 @@ namespace OpenSim.Data.MySQL | |||
42 | private int m_LastExpire; | 43 | private int m_LastExpire; |
43 | // private string m_connectionString; | 44 | // private string m_connectionString; |
44 | 45 | ||
46 | protected virtual Assembly Assembly | ||
47 | { | ||
48 | get { return GetType().Assembly; } | ||
49 | } | ||
50 | |||
45 | public MySqlAuthenticationData(string connectionString, string realm) | 51 | public MySqlAuthenticationData(string connectionString, string realm) |
46 | : base(connectionString) | 52 | : base(connectionString) |
47 | { | 53 | { |
@@ -51,7 +57,7 @@ namespace OpenSim.Data.MySQL | |||
51 | using (MySqlConnection dbcon = new MySqlConnection(m_connectionString)) | 57 | using (MySqlConnection dbcon = new MySqlConnection(m_connectionString)) |
52 | { | 58 | { |
53 | dbcon.Open(); | 59 | dbcon.Open(); |
54 | Migration m = new Migration(dbcon, GetType().Assembly, "AuthStore"); | 60 | Migration m = new Migration(dbcon, Assembly, "AuthStore"); |
55 | m.Update(); | 61 | m.Update(); |
56 | } | 62 | } |
57 | } | 63 | } |