From 73e527fffc6c7a9241ec6a29963a54e085ff0c98 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Tue, 22 Mar 2016 20:01:22 +0100
Subject: Fix some artefacts that came from merging the OSGrid code.

---
 OpenSim/Data/MySQL/MySQLFSAssetData.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'OpenSim')

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
             {
                 using (MySqlConnection conn = new MySqlConnection(m_ConnectionString))
                 {
+                    conn.Open();
                     Migration m = new Migration(conn, Assembly, "FSAssetStore");
                     m.Update();
                 }
@@ -150,7 +151,7 @@ namespace OpenSim.Data.MySQL
 
                 using (MySqlCommand cmd = conn.CreateCommand())
                 {
-                    cmd.CommandText = String.Format("select id, name, description, type, hash, create_time, asset_flags from {0} where id = ?id", m_Table);
+                    cmd.CommandText = String.Format("select id, name, description, type, hash, create_time, asset_flags, access_time from {0} where id = ?id", m_Table);
                     cmd.Parameters.AddWithValue("?id", id);
 
                     using (IDataReader reader = cmd.ExecuteReader())
-- 
cgit v1.1