Attachment persistence!!! Patch #9169 (Mantis #1171)

Attachments now save to MySQL. No reattach on login yet.

2 files changed, 9 insertions, 5 deletions

diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs
index 9f50c9f..b857aad 100644
--- a/OpenSim/Data/MySQL/MySQLManager.cs
+++ b/OpenSim/Data/MySQL/MySQLManager.cs
@@ -1208,7 +1208,10 @@ namespace OpenSim.Data.MySQL
             
             cmd.ExecuteNonQuery();
 
-            sql = "insert into avatarattachments (UUID, attachpoint, item, asset) values (?uuid, ?attchpoint, ?item, ?asset)";
+            if (data == null)
+                return;
+
+            sql = "insert into avatarattachments (UUID, attachpoint, item, asset) values (?uuid, ?attachpoint, ?item, ?asset)";
 
             cmd = (MySqlCommand) dbcon.CreateCommand();
             cmd.CommandText = sql;
diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs
index 1ae5645..82ca5b1 100644
--- a/OpenSim/Data/MySQL/MySQLUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserData.cs
@@ -834,14 +834,15 @@ namespace OpenSim.Data.MySQL
 
             IDataReader r = cmd.ExecuteReader();
 
-            return database.readAttachments(r);
+            Hashtable ret =  database.readAttachments(r);
+
+            r.Close();
+
+            return ret;
         }
 
         public void UpdateUserAttachments(LLUUID agentID, Hashtable data)
         {
-            if(data == null)
-                return;
-
             database.writeAttachments(agentID, data);
         }
     }