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/MySQLAssetData.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/MySQLAssetData.cs')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLAssetData.cs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs index ed92f3e..e740232 100644 --- a/OpenSim/Data/MySQL/MySQLAssetData.cs +++ b/OpenSim/Data/MySQL/MySQLAssetData.cs | |||
@@ -47,6 +47,11 @@ namespace OpenSim.Data.MySQL | |||
47 | private string m_connectionString; | 47 | private string m_connectionString; |
48 | private object m_dbLock = new object(); | 48 | private object m_dbLock = new object(); |
49 | 49 | ||
50 | protected virtual Assembly Assembly | ||
51 | { | ||
52 | get { return GetType().Assembly; } | ||
53 | } | ||
54 | |||
50 | #region IPlugin Members | 55 | #region IPlugin Members |
51 | 56 | ||
52 | public override string Version { get { return "1.0.0.0"; } } | 57 | public override string Version { get { return "1.0.0.0"; } } |
@@ -66,13 +71,10 @@ namespace OpenSim.Data.MySQL | |||
66 | { | 71 | { |
67 | m_connectionString = connect; | 72 | m_connectionString = connect; |
68 | 73 | ||
69 | // This actually does the roll forward assembly stuff | ||
70 | Assembly assem = GetType().Assembly; | ||
71 | |||
72 | using (MySqlConnection dbcon = new MySqlConnection(m_connectionString)) | 74 | using (MySqlConnection dbcon = new MySqlConnection(m_connectionString)) |
73 | { | 75 | { |
74 | dbcon.Open(); | 76 | dbcon.Open(); |
75 | Migration m = new Migration(dbcon, assem, "AssetStore"); | 77 | Migration m = new Migration(dbcon, Assembly, "AssetStore"); |
76 | m.Update(); | 78 | m.Update(); |
77 | } | 79 | } |
78 | } | 80 | } |