Merge branch 'master' into presence-refactor

This was a large, heavily conflicted merge and things MAY have got broken.
Please check!

1 files changed, 16 insertions, 17 deletions

diff --git a/OpenSim/Data/MySQL/MySQLPresenceData.cs b/OpenSim/Data/MySQL/MySQLPresenceData.cs
index e5dd0e5..4950f7f 100644
--- a/OpenSim/Data/MySQL/MySQLPresenceData.cs
+++ b/OpenSim/Data/MySQL/MySQLPresenceData.cs
@@ -123,27 +123,26 @@ namespace OpenSim.Data.MySQL
 
             cmd.Parameters.AddWithValue("?UserID", userID);
 
-            IDataReader reader = ExecuteReader(cmd);
-
-            List<UUID> deleteSessions = new List<UUID>();
-            int online = 0;
-
-            while(reader.Read())
+            using (IDataReader reader = cmd.ExecuteReader())
             {
-                if (bool.Parse(reader["Online"].ToString()))
-                    online++;
-                else
-                    deleteSessions.Add(new UUID(reader["SessionID"].ToString()));
-            }
 
-            if (online == 0 && deleteSessions.Count > 0)
-                deleteSessions.RemoveAt(0);
+                List<UUID> deleteSessions = new List<UUID>();
+                int online = 0;
 
-            reader.Close();
-            CloseReaderCommand(cmd);
+                while(reader.Read())
+                {
+                    if (bool.Parse(reader["Online"].ToString()))
+                        online++;
+                    else
+                        deleteSessions.Add(new UUID(reader["SessionID"].ToString()));
+                }
 
-            foreach (UUID s in deleteSessions)
-                Delete("SessionID", s.ToString());
+                if (online == 0 && deleteSessions.Count > 0)
+                    deleteSessions.RemoveAt(0);
+
+                foreach (UUID s in deleteSessions)
+                    Delete("SessionID", s.ToString());
+            }
         }
     }
 }