diff options
author | Melanie Thielker | 2016-03-22 20:01:22 +0100 |
---|---|---|
committer | Melanie Thielker | 2016-03-22 20:01:22 +0100 |
commit | 73e527fffc6c7a9241ec6a29963a54e085ff0c98 (patch) | |
tree | ff09f4aaf71a8ab83e817edd22f4c794edca056a /OpenSim/Data/MySQL | |
parent | Add osRequestURL and osRequestSecureURL with an options list. (diff) | |
download | opensim-SC_OLD-73e527fffc6c7a9241ec6a29963a54e085ff0c98.zip opensim-SC_OLD-73e527fffc6c7a9241ec6a29963a54e085ff0c98.tar.gz opensim-SC_OLD-73e527fffc6c7a9241ec6a29963a54e085ff0c98.tar.bz2 opensim-SC_OLD-73e527fffc6c7a9241ec6a29963a54e085ff0c98.tar.xz |
Fix some artefacts that came from merging the OSGrid code.
Diffstat (limited to 'OpenSim/Data/MySQL')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLFSAssetData.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Data/MySQL/MySQLFSAssetData.cs b/OpenSim/Data/MySQL/MySQLFSAssetData.cs index 40bfd1f..cb1755e 100644 --- a/OpenSim/Data/MySQL/MySQLFSAssetData.cs +++ b/OpenSim/Data/MySQL/MySQLFSAssetData.cs | |||
@@ -75,6 +75,7 @@ namespace OpenSim.Data.MySQL | |||
75 | { | 75 | { |
76 | using (MySqlConnection conn = new MySqlConnection(m_ConnectionString)) | 76 | using (MySqlConnection conn = new MySqlConnection(m_ConnectionString)) |
77 | { | 77 | { |
78 | conn.Open(); | ||
78 | Migration m = new Migration(conn, Assembly, "FSAssetStore"); | 79 | Migration m = new Migration(conn, Assembly, "FSAssetStore"); |
79 | m.Update(); | 80 | m.Update(); |
80 | } | 81 | } |
@@ -150,7 +151,7 @@ namespace OpenSim.Data.MySQL | |||
150 | 151 | ||
151 | using (MySqlCommand cmd = conn.CreateCommand()) | 152 | using (MySqlCommand cmd = conn.CreateCommand()) |
152 | { | 153 | { |
153 | cmd.CommandText = String.Format("select id, name, description, type, hash, create_time, asset_flags from {0} where id = ?id", m_Table); | 154 | cmd.CommandText = String.Format("select id, name, description, type, hash, create_time, asset_flags, access_time from {0} where id = ?id", m_Table); |
154 | cmd.Parameters.AddWithValue("?id", id); | 155 | cmd.Parameters.AddWithValue("?id", id); |
155 | 156 | ||
156 | using (IDataReader reader = cmd.ExecuteReader()) | 157 | using (IDataReader reader = cmd.ExecuteReader()) |