Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim

18 files changed, 1165 insertions, 1284 deletions

diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
index 8c9eb5f..c649c5a 100644
--- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
+++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
@@ -95,16 +95,15 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
 
             ManagedImage tmp;
             Image imgData;
+            byte[] jpegdata;
 
             OpenJPEG.DecodeToImage(asset.Data, out tmp, out imgData);
-            
-            MemoryStream ms = new MemoryStream();
 
-            imgData.Save(ms, ImageFormat.Jpeg);
-
-            byte[] jpegdata = ms.GetBuffer();
-
-            ms.Close();
+            using (MemoryStream ms = new MemoryStream())
+            {
+                imgData.Save(ms, ImageFormat.Jpeg);
+                jpegdata = ms.GetBuffer();
+            }
 
             resp.ContentType = "image/jpeg";
             resp.ContentLength = jpegdata.Length;
diff --git a/OpenSim/Data/MSSQL/AutoClosingSqlCommand.cs b/OpenSim/Data/MSSQL/AutoClosingSqlCommand.cs
index 93e48cd..0e21880 100644
--- a/OpenSim/Data/MSSQL/AutoClosingSqlCommand.cs
+++ b/OpenSim/Data/MSSQL/AutoClosingSqlCommand.cs
@@ -197,20 +197,11 @@ namespace OpenSim.Data.MSSQL
         public void Dispose()
         {
             SqlConnection conn = realCommand.Connection;
-            try
-            {
-                realCommand.Dispose();
-            }
+            try { realCommand.Dispose(); }
             finally
             {
-                try
-                {
-                    conn.Close();
-                }
-                finally
-                {
-                    conn.Dispose();
-                }
+                try { conn.Dispose(); }
+                finally { }
             }
         }
 
diff --git a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
index 1482184..d49c2b3 100644
--- a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
@@ -348,8 +348,6 @@ namespace OpenSim.Data.MSSQL
                 //Delete the actual row
                 DeleteOneFolder(folderID, connection);
                 DeleteItemsInFolder(folderID, connection);
-
-                connection.Close();
             }
         }
 
diff --git a/OpenSim/Data/MSSQL/MSSQLManager.cs b/OpenSim/Data/MSSQL/MSSQLManager.cs
index 3d7a768..992ce02 100644
--- a/OpenSim/Data/MSSQL/MSSQLManager.cs
+++ b/OpenSim/Data/MSSQL/MSSQLManager.cs
@@ -340,8 +340,6 @@ namespace OpenSim.Data.MSSQL
                 MSSQLMigration migration = new MSSQLMigration(connection, assem, migrationStore);
 
                 migration.Update();
-
-                connection.Close();
             }
         }
 
@@ -385,9 +383,7 @@ namespace OpenSim.Data.MSSQL
                         m_log.Error(e.ToString());
                     }
                 }
-                tables.Close();
             }
-
         }
 
         /// <summary>
diff --git a/OpenSim/Data/MSSQL/MSSQLMigration.cs b/OpenSim/Data/MSSQL/MSSQLMigration.cs
index aea31c9..549bcb3 100644
--- a/OpenSim/Data/MSSQL/MSSQLMigration.cs
+++ b/OpenSim/Data/MSSQL/MSSQLMigration.cs
@@ -56,7 +56,6 @@ namespace OpenSim.Data.MSSQL
                         {
                             version = Convert.ToInt32(reader["version"]);
                         }
-                        reader.Close();
                     }
                 }
                 catch
diff --git a/OpenSim/Data/Migration.cs b/OpenSim/Data/Migration.cs
index e51dc22..7a99d4a 100644
--- a/OpenSim/Data/Migration.cs
+++ b/OpenSim/Data/Migration.cs
@@ -131,25 +131,26 @@ namespace OpenSim.Data
             m_log.InfoFormat("[MIGRATIONS] Upgrading {0} to latest revision.", _type);
             m_log.Info("[MIGRATIONS] NOTE: this may take a while, don't interupt this process!");
 
-            DbCommand cmd = _conn.CreateCommand();
-            foreach (KeyValuePair<int, string> kvp in migrations)
+            using (DbCommand cmd = _conn.CreateCommand())
             {
-                int newversion = kvp.Key;
-                cmd.CommandText = kvp.Value;
-                // we need to up the command timeout to infinite as we might be doing long migrations.
-                cmd.CommandTimeout = 0;
-                cmd.ExecuteNonQuery();
-
-                if (version == 0)
-                {
-                    InsertVersion(_type, newversion);
-                }
-                else
+                foreach (KeyValuePair<int, string> kvp in migrations)
                 {
-                    UpdateVersion(_type, newversion);
+                    int newversion = kvp.Key;
+                    cmd.CommandText = kvp.Value;
+                    // we need to up the command timeout to infinite as we might be doing long migrations.
+                    cmd.CommandTimeout = 0;
+                    cmd.ExecuteNonQuery();
+
+                    if (version == 0)
+                    {
+                        InsertVersion(_type, newversion);
+                    }
+                    else
+                    {
+                        UpdateVersion(_type, newversion);
+                    }
+                    version = newversion;
                 }
-                version = newversion;
-                cmd.Dispose();
             }
         }
 
@@ -189,43 +190,45 @@ namespace OpenSim.Data
         protected virtual int FindVersion(DbConnection conn, string type)
         {
             int version = 0;
-            DbCommand cmd = conn.CreateCommand();
-            try
+
+            using (DbCommand cmd = conn.CreateCommand())
             {
-                cmd.CommandText = "select version from migrations where name='" + type +"' order by version desc";
-                using (IDataReader reader = cmd.ExecuteReader())
+                try
                 {
-                    if (reader.Read())
+                    cmd.CommandText = "select version from migrations where name='" + type + "' order by version desc";
+                    using (IDataReader reader = cmd.ExecuteReader())
                     {
-                        version = Convert.ToInt32(reader["version"]);
+                        if (reader.Read())
+                            version = Convert.ToInt32(reader["version"]);
                     }
-                    reader.Close();
+                }
+                catch
+                {
+                    // Something went wrong, so we're version 0
                 }
             }
-            catch
-            {
-                // Something went wrong, so we're version 0
-            }
-            cmd.Dispose();
+
             return version;
         }
 
         private void InsertVersion(string type, int version)
         {
-            DbCommand cmd = _conn.CreateCommand();
-            cmd.CommandText = "insert into migrations(name, version) values('" + type + "', " + version + ")";
-            m_log.InfoFormat("[MIGRATIONS]: Creating {0} at version {1}", type, version);
-            cmd.ExecuteNonQuery();
-            cmd.Dispose();
+            using (DbCommand cmd = _conn.CreateCommand())
+            {
+                cmd.CommandText = "insert into migrations(name, version) values('" + type + "', " + version + ")";
+                m_log.InfoFormat("[MIGRATIONS]: Creating {0} at version {1}", type, version);
+                cmd.ExecuteNonQuery();
+            }
         }
 
         private void UpdateVersion(string type, int version)
         {
-            DbCommand cmd = _conn.CreateCommand();
-            cmd.CommandText = "update migrations set version=" + version + " where name='" + type + "'";
-            m_log.InfoFormat("[MIGRATIONS]: Updating {0} to version {1}", type, version);
-            cmd.ExecuteNonQuery();
-            cmd.Dispose();
+            using (DbCommand cmd = _conn.CreateCommand())
+            {
+                cmd.CommandText = "update migrations set version=" + version + " where name='" + type + "'";
+                m_log.InfoFormat("[MIGRATIONS]: Updating {0} to version {1}", type, version);
+                cmd.ExecuteNonQuery();
+            }
         }
 
         // private SortedList<int, string> GetAllMigrations()
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index 0502b2b..8f97440 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -142,46 +142,45 @@ namespace OpenSim.Data.MySQL
             {
                 _dbConnection.CheckConnection();
 
-                MySqlCommand cmd =
-                    new MySqlCommand(
-                        "SELECT name, description, assetType, local, temporary, data FROM assets WHERE id=?id",
-                        _dbConnection.Connection);
-                cmd.Parameters.AddWithValue("?id", assetID.ToString());
-
-                try
+                using (MySqlCommand cmd = new MySqlCommand(
+                    "SELECT name, description, assetType, local, temporary, data FROM assets WHERE id=?id",
+                    _dbConnection.Connection))
                 {
-                    using (MySqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow))
+                    cmd.Parameters.AddWithValue("?id", assetID.ToString());
+
+                    try
                     {
-                        if (dbReader.Read())
+                        using (MySqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                         {
-                            asset = new AssetBase();
-                            asset.Data = (byte[]) dbReader["data"];
-                            asset.Description = (string) dbReader["description"];
-                            asset.FullID = assetID;
-                            try
-                            {
-                                asset.Local = (bool)dbReader["local"];
-                            }
-                            catch (InvalidCastException)
+                            if (dbReader.Read())
                             {
-                                asset.Local = false;
+                                asset = new AssetBase();
+                                asset.Data = (byte[])dbReader["data"];
+                                asset.Description = (string)dbReader["description"];
+                                asset.FullID = assetID;
+
+                                string local = dbReader["local"].ToString();
+                                if (local.Equals("1") || local.Equals("true", StringComparison.InvariantCultureIgnoreCase))
+                                    asset.Local = true;
+                                else
+                                    asset.Local = false;
+
+                                asset.Name = (string)dbReader["name"];
+                                asset.Type = (sbyte)dbReader["assetType"];
+                                asset.Temporary = Convert.ToBoolean(dbReader["temporary"]);
                             }
-                            asset.Name = (string) dbReader["name"];
-                            asset.Type = (sbyte) dbReader["assetType"];
-                            asset.Temporary = Convert.ToBoolean(dbReader["temporary"]);
                         }
-                        dbReader.Close();
-                        cmd.Dispose();
+
+                        if (asset != null)
+                            UpdateAccessTime(asset);
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.ErrorFormat(
+                            "[ASSETS DB]: MySql failure fetching asset {0}" + Environment.NewLine + e.ToString()
+                            + Environment.NewLine + "Reconnecting", assetID);
+                        _dbConnection.Reconnect();
                     }
-                    if (asset != null)
-                        UpdateAccessTime(asset);
-                }
-                catch (Exception e)
-                {
-                    m_log.ErrorFormat(
-                        "[ASSETS DB]: MySql failure fetching asset {0}" + Environment.NewLine + e.ToString()
-                        + Environment.NewLine + "Reconnecting", assetID);
-                    _dbConnection.Reconnect();
                 }
             }
             return asset;
@@ -297,32 +296,27 @@ namespace OpenSim.Data.MySQL
             {
                 _dbConnection.CheckConnection();
 
-                MySqlCommand cmd =
-                    new MySqlCommand(
-                        "SELECT id FROM assets WHERE id=?id",
-                        _dbConnection.Connection);
-
-                cmd.Parameters.AddWithValue("?id", uuid.ToString());
-
-                try
+                using (MySqlCommand cmd = new MySqlCommand(
+                    "SELECT id FROM assets WHERE id=?id",
+                    _dbConnection.Connection))
                 {
-                    using (MySqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow))
+                    cmd.Parameters.AddWithValue("?id", uuid.ToString());
+
+                    try
                     {
-                        if (dbReader.Read())
+                        using (MySqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                         {
-                            assetExists = true;
+                            if (dbReader.Read())
+                                assetExists = true;
                         }
-
-                        dbReader.Close();
-                        cmd.Dispose();
                     }
-                }
-                catch (Exception e)
-                {
-                    m_log.ErrorFormat(
-                        "[ASSETS DB]: MySql failure fetching asset {0}" + Environment.NewLine + e.ToString()
-                        + Environment.NewLine + "Attempting reconnection", uuid);
-                    _dbConnection.Reconnect();
+                    catch (Exception e)
+                    {
+                        m_log.ErrorFormat(
+                            "[ASSETS DB]: MySql failure fetching asset {0}" + Environment.NewLine + e.ToString()
+                            + Environment.NewLine + "Attempting reconnection", uuid);
+                        _dbConnection.Reconnect();
+                    }
                 }
             }
 
diff --git a/OpenSim/Data/MySQL/MySQLAuthenticationData.cs b/OpenSim/Data/MySQL/MySQLAuthenticationData.cs
index e508b52..e96a123 100644
--- a/OpenSim/Data/MySQL/MySQLAuthenticationData.cs
+++ b/OpenSim/Data/MySQL/MySQLAuthenticationData.cs
@@ -55,44 +55,38 @@ namespace OpenSim.Data.MySQL
             AuthenticationData ret = new AuthenticationData();
             ret.Data = new Dictionary<string, object>();
 
-            MySqlCommand cmd = new MySqlCommand(
-                "select * from `"+m_Realm+"` where UUID = ?principalID"
-            );
-
-            cmd.Parameters.AddWithValue("?principalID", principalID.ToString());
-
-            IDataReader result = ExecuteReader(cmd);
-
-            if (result.Read())
+            using (MySqlCommand cmd = new MySqlCommand("select * from `" + m_Realm + "` where UUID = ?principalID"))
             {
-                ret.PrincipalID = principalID;
+                cmd.Parameters.AddWithValue("?principalID", principalID.ToString());
 
-                if (m_ColumnNames == null)
+                using (IDataReader result = ExecuteReader(cmd))
                 {
-                    m_ColumnNames = new List<string>();
+                    if (result.Read())
+                    {
+                        ret.PrincipalID = principalID;
 
-                    DataTable schemaTable = result.GetSchemaTable();
-                    foreach (DataRow row in schemaTable.Rows)
-                        m_ColumnNames.Add(row["ColumnName"].ToString());
-                }
+                        if (m_ColumnNames == null)
+                        {
+                            m_ColumnNames = new List<string>();
 
-                foreach (string s in m_ColumnNames)
-                {
-                    if (s == "UUID")
-                        continue;
+                            DataTable schemaTable = result.GetSchemaTable();
+                            foreach (DataRow row in schemaTable.Rows)
+                                m_ColumnNames.Add(row["ColumnName"].ToString());
+                        }
 
-                    ret.Data[s] = result[s].ToString();
-                }
+                        foreach (string s in m_ColumnNames)
+                        {
+                            if (s == "UUID")
+                                continue;
 
-                result.Close();
-                CloseReaderCommand(cmd);
+                            ret.Data[s] = result[s].ToString();
+                        }
 
-                return ret;
+                        return ret;
+                    }
+                }
             }
 
-            result.Close();
-            CloseReaderCommand(cmd);
-
             return null;
         }
 
diff --git a/OpenSim/Data/MySQL/MySQLEstateData.cs b/OpenSim/Data/MySQL/MySQLEstateData.cs
index e8694fc..7166b29 100644
--- a/OpenSim/Data/MySQL/MySQLEstateData.cs
+++ b/OpenSim/Data/MySQL/MySQLEstateData.cs
@@ -95,21 +95,17 @@ namespace OpenSim.Data.MySQL
 
         protected void GetWaitTimeout()
         {
-            MySqlCommand cmd = new MySqlCommand(m_waitTimeoutSelect,
-                    m_connection);
-
-            using (MySqlDataReader dbReader =
-                    cmd.ExecuteReader(CommandBehavior.SingleRow))
+            using (MySqlCommand cmd = new MySqlCommand(m_waitTimeoutSelect, m_connection))
             {
-                if (dbReader.Read())
+                using (MySqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                 {
-                    m_waitTimeout
-                        = Convert.ToInt32(dbReader["@@wait_timeout"]) *
-                        TimeSpan.TicksPerSecond + m_waitTimeoutLeeway;
+                    if (dbReader.Read())
+                    {
+                        m_waitTimeout
+                            = Convert.ToInt32(dbReader["@@wait_timeout"]) *
+                            TimeSpan.TicksPerSecond + m_waitTimeoutLeeway;
+                    }
                 }
-
-                dbReader.Close();
-                cmd.Dispose();
             }
 
             m_lastConnectionUse = DateTime.Now.Ticks;
@@ -147,110 +143,103 @@ namespace OpenSim.Data.MySQL
 
             CheckConnection();
 
-            MySqlCommand cmd = m_connection.CreateCommand();
+            bool migration = true;
 
-            cmd.CommandText = sql;
-            cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
-
-            IDataReader r = cmd.ExecuteReader();
-
-            if (r.Read())
+            using (MySqlCommand cmd = m_connection.CreateCommand())
             {
-                foreach (string name in FieldList)
-                {
-                    if (m_FieldMap[name].GetValue(es) is bool)
-                    {
-                        int v = Convert.ToInt32(r[name]);
-                        if (v != 0)
-                            m_FieldMap[name].SetValue(es, true);
-                        else
-                            m_FieldMap[name].SetValue(es, false);
-                    }
-                    else if (m_FieldMap[name].GetValue(es) is UUID)
-                    {
-                        UUID uuid = UUID.Zero;
+                cmd.CommandText = sql;
+                cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
 
-                        UUID.TryParse(r[name].ToString(), out uuid);
-                        m_FieldMap[name].SetValue(es, uuid);
-                    }
-                    else
+                using (IDataReader r = cmd.ExecuteReader())
+                {
+                    if (r.Read())
                     {
-                        m_FieldMap[name].SetValue(es, r[name]);
+                        migration = false;
+
+                        foreach (string name in FieldList)
+                        {
+                            if (m_FieldMap[name].GetValue(es) is bool)
+                            {
+                                int v = Convert.ToInt32(r[name]);
+                                if (v != 0)
+                                    m_FieldMap[name].SetValue(es, true);
+                                else
+                                    m_FieldMap[name].SetValue(es, false);
+                            }
+                            else if (m_FieldMap[name].GetValue(es) is UUID)
+                            {
+                                UUID uuid = UUID.Zero;
+
+                                UUID.TryParse(r[name].ToString(), out uuid);
+                                m_FieldMap[name].SetValue(es, uuid);
+                            }
+                            else
+                            {
+                                m_FieldMap[name].SetValue(es, r[name]);
+                            }
+                        }
                     }
                 }
-                r.Close();
             }
-            else
+
+            if (migration)
             {
                 // Migration case
-                //
-                r.Close();
-
                 List<string> names = new List<string>(FieldList);
 
                 names.Remove("EstateID");
 
                 sql = "insert into estate_settings (" + String.Join(",", names.ToArray()) + ") values ( ?" + String.Join(", ?", names.ToArray()) + ")";
 
-                cmd.CommandText = sql;
-                cmd.Parameters.Clear();
-
-                foreach (string name in FieldList)
+                using (MySqlCommand cmd = m_connection.CreateCommand())
                 {
-                    if (m_FieldMap[name].GetValue(es) is bool)
+                    cmd.CommandText = sql;
+                    cmd.Parameters.Clear();
+
+                    foreach (string name in FieldList)
                     {
-                        if ((bool)m_FieldMap[name].GetValue(es))
-                            cmd.Parameters.AddWithValue("?" + name, "1");
+                        if (m_FieldMap[name].GetValue(es) is bool)
+                        {
+                            if ((bool)m_FieldMap[name].GetValue(es))
+                                cmd.Parameters.AddWithValue("?" + name, "1");
+                            else
+                                cmd.Parameters.AddWithValue("?" + name, "0");
+                        }
                         else
-                            cmd.Parameters.AddWithValue("?" + name, "0");
+                        {
+                            cmd.Parameters.AddWithValue("?" + name, m_FieldMap[name].GetValue(es).ToString());
+                        }
                     }
-                    else
-                    {
-                        cmd.Parameters.AddWithValue("?" + name, m_FieldMap[name].GetValue(es).ToString());
-                    }
-                }
-
-                cmd.ExecuteNonQuery();
 
-                cmd.CommandText = "select LAST_INSERT_ID() as id";
-                cmd.Parameters.Clear();
-
-                r = cmd.ExecuteReader();
+                    cmd.ExecuteNonQuery();
 
-                r.Read();
+                    cmd.CommandText = "select LAST_INSERT_ID() as id";
+                    cmd.Parameters.Clear();
 
-                es.EstateID = Convert.ToUInt32(r["id"]);
+                    using (IDataReader r = cmd.ExecuteReader())
+                    {
+                        r.Read();
+                        es.EstateID = Convert.ToUInt32(r["id"]);
+                    }
 
-                r.Close();
+                    cmd.CommandText = "insert into estate_map values (?RegionID, ?EstateID)";
+                    cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
+                    cmd.Parameters.AddWithValue("?EstateID", es.EstateID.ToString());
 
-                cmd.CommandText = "insert into estate_map values (?RegionID, ?EstateID)";
-                cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
-                cmd.Parameters.AddWithValue("?EstateID", es.EstateID.ToString());
+                    // This will throw on dupe key
+                    try { cmd.ExecuteNonQuery(); }
+                    catch (Exception) { }
 
-                // This will throw on dupe key
-                try
-                {
-                    cmd.ExecuteNonQuery();
-                }
-                catch (Exception)
-                {
-                }
+                    // Munge and transfer the ban list
+                    cmd.Parameters.Clear();
+                    cmd.CommandText = "insert into estateban select " + es.EstateID.ToString() + ", bannedUUID, bannedIp, bannedIpHostMask, '' from regionban where regionban.regionUUID = ?UUID";
+                    cmd.Parameters.AddWithValue("?UUID", regionID.ToString());
 
-                // Munge and transfer the ban list
-                //
-                cmd.Parameters.Clear();
-                cmd.CommandText = "insert into estateban select " + es.EstateID.ToString() + ", bannedUUID, bannedIp, bannedIpHostMask, '' from regionban where regionban.regionUUID = ?UUID";
-                cmd.Parameters.AddWithValue("?UUID", regionID.ToString());
+                    try { cmd.ExecuteNonQuery(); }
+                    catch (Exception) { }
 
-                try
-                {
-                    cmd.ExecuteNonQuery();
-                }
-                catch (Exception)
-                {
+                    es.Save();
                 }
-
-                es.Save();
             }
 
             LoadBanList(es);
@@ -267,26 +256,27 @@ namespace OpenSim.Data.MySQL
 
             CheckConnection();
 
-            MySqlCommand cmd = m_connection.CreateCommand();
-
-            cmd.CommandText = sql;
-
-            foreach (string name in FieldList)
+            using (MySqlCommand cmd = m_connection.CreateCommand())
             {
-                if (m_FieldMap[name].GetValue(es) is bool)
+                cmd.CommandText = sql;
+
+                foreach (string name in FieldList)
                 {
-                    if ((bool)m_FieldMap[name].GetValue(es))
-                        cmd.Parameters.AddWithValue("?" + name, "1");
+                    if (m_FieldMap[name].GetValue(es) is bool)
+                    {
+                        if ((bool)m_FieldMap[name].GetValue(es))
+                            cmd.Parameters.AddWithValue("?" + name, "1");
+                        else
+                            cmd.Parameters.AddWithValue("?" + name, "0");
+                    }
                     else
-                        cmd.Parameters.AddWithValue("?" + name, "0");
-                }
-                else
-                {
-                    cmd.Parameters.AddWithValue("?" + name, m_FieldMap[name].GetValue(es).ToString());
+                    {
+                        cmd.Parameters.AddWithValue("?" + name, m_FieldMap[name].GetValue(es).ToString());
+                    }
                 }
-            }
 
-            cmd.ExecuteNonQuery();
+                cmd.ExecuteNonQuery();
+            }
 
             SaveBanList(es);
             SaveUUIDList(es.EstateID, "estate_managers", es.EstateManagers);
@@ -300,50 +290,52 @@ namespace OpenSim.Data.MySQL
 
             CheckConnection();
 
-            MySqlCommand cmd = m_connection.CreateCommand();
-
-            cmd.CommandText = "select bannedUUID from estateban where EstateID = ?EstateID";
-            cmd.Parameters.AddWithValue("?EstateID", es.EstateID);
-
-            IDataReader r = cmd.ExecuteReader();
-
-            while (r.Read())
+            using (MySqlCommand cmd = m_connection.CreateCommand())
             {
-                EstateBan eb = new EstateBan();
+                cmd.CommandText = "select bannedUUID from estateban where EstateID = ?EstateID";
+                cmd.Parameters.AddWithValue("?EstateID", es.EstateID);
+
+                using (IDataReader r = cmd.ExecuteReader())
+                {
+                    while (r.Read())
+                    {
+                        EstateBan eb = new EstateBan();
 
-                UUID uuid = new UUID();
-                UUID.TryParse(r["bannedUUID"].ToString(), out uuid);
+                        UUID uuid = new UUID();
+                        UUID.TryParse(r["bannedUUID"].ToString(), out uuid);
 
-                eb.BannedUserID = uuid;
-                eb.BannedHostAddress = "0.0.0.0";
-                eb.BannedHostIPMask = "0.0.0.0";
-                es.AddBan(eb);
+                        eb.BannedUserID = uuid;
+                        eb.BannedHostAddress = "0.0.0.0";
+                        eb.BannedHostIPMask = "0.0.0.0";
+                        es.AddBan(eb);
+                    }
+                }
             }
-            r.Close();
         }
 
         private void SaveBanList(EstateSettings es)
         {
             CheckConnection();
 
-            MySqlCommand cmd = m_connection.CreateCommand();
-
-            cmd.CommandText = "delete from estateban where EstateID = ?EstateID";
-            cmd.Parameters.AddWithValue("?EstateID", es.EstateID.ToString());
-
-            cmd.ExecuteNonQuery();
-
-            cmd.Parameters.Clear();
-
-            cmd.CommandText = "insert into estateban (EstateID, bannedUUID, bannedIp, bannedIpHostMask, bannedNameMask) values ( ?EstateID, ?bannedUUID, '', '', '' )";
-
-            foreach (EstateBan b in es.EstateBans)
+            using (MySqlCommand cmd = m_connection.CreateCommand())
             {
+                cmd.CommandText = "delete from estateban where EstateID = ?EstateID";
                 cmd.Parameters.AddWithValue("?EstateID", es.EstateID.ToString());
-                cmd.Parameters.AddWithValue("?bannedUUID", b.BannedUserID.ToString());
 
                 cmd.ExecuteNonQuery();
+
                 cmd.Parameters.Clear();
+
+                cmd.CommandText = "insert into estateban (EstateID, bannedUUID, bannedIp, bannedIpHostMask, bannedNameMask) values ( ?EstateID, ?bannedUUID, '', '', '' )";
+
+                foreach (EstateBan b in es.EstateBans)
+                {
+                    cmd.Parameters.AddWithValue("?EstateID", es.EstateID.ToString());
+                    cmd.Parameters.AddWithValue("?bannedUUID", b.BannedUserID.ToString());
+
+                    cmd.ExecuteNonQuery();
+                    cmd.Parameters.Clear();
+                }
             }
         }
 
@@ -351,24 +343,25 @@ namespace OpenSim.Data.MySQL
         {
             CheckConnection();
 
-            MySqlCommand cmd = m_connection.CreateCommand();
-
-            cmd.CommandText = "delete from " + table + " where EstateID = ?EstateID";
-            cmd.Parameters.AddWithValue("?EstateID", EstateID.ToString());
-
-            cmd.ExecuteNonQuery();
-
-            cmd.Parameters.Clear();
-
-            cmd.CommandText = "insert into " + table + " (EstateID, uuid) values ( ?EstateID, ?uuid )";
-
-            foreach (UUID uuid in data)
+            using (MySqlCommand cmd = m_connection.CreateCommand())
             {
+                cmd.CommandText = "delete from " + table + " where EstateID = ?EstateID";
                 cmd.Parameters.AddWithValue("?EstateID", EstateID.ToString());
-                cmd.Parameters.AddWithValue("?uuid", uuid.ToString());
 
                 cmd.ExecuteNonQuery();
+
                 cmd.Parameters.Clear();
+
+                cmd.CommandText = "insert into " + table + " (EstateID, uuid) values ( ?EstateID, ?uuid )";
+
+                foreach (UUID uuid in data)
+                {
+                    cmd.Parameters.AddWithValue("?EstateID", EstateID.ToString());
+                    cmd.Parameters.AddWithValue("?uuid", uuid.ToString());
+
+                    cmd.ExecuteNonQuery();
+                    cmd.Parameters.Clear();
+                }
             }
         }
 
@@ -378,23 +371,24 @@ namespace OpenSim.Data.MySQL
 
             CheckConnection();
 
-            MySqlCommand cmd = m_connection.CreateCommand();
-
-            cmd.CommandText = "select uuid from " + table + " where EstateID = ?EstateID";
-            cmd.Parameters.AddWithValue("?EstateID", EstateID);
-
-            IDataReader r = cmd.ExecuteReader();
-
-            while (r.Read())
+            using (MySqlCommand cmd = m_connection.CreateCommand())
             {
-                // EstateBan eb = new EstateBan();
+                cmd.CommandText = "select uuid from " + table + " where EstateID = ?EstateID";
+                cmd.Parameters.AddWithValue("?EstateID", EstateID);
 
-                UUID uuid = new UUID();
-                UUID.TryParse(r["uuid"].ToString(), out uuid);
+                using (IDataReader r = cmd.ExecuteReader())
+                {
+                    while (r.Read())
+                    {
+                        // EstateBan eb = new EstateBan();
 
-                uuids.Add(uuid);
+                        UUID uuid = new UUID();
+                        UUID.TryParse(r["uuid"].ToString(), out uuid);
+
+                        uuids.Add(uuid);
+                    }
+                }
             }
-            r.Close();
 
             return uuids.ToArray();
         }
diff --git a/OpenSim/Data/MySQL/MySQLFramework.cs b/OpenSim/Data/MySQL/MySQLFramework.cs
index 6c73249..c756c9c 100644
--- a/OpenSim/Data/MySQL/MySQLFramework.cs
+++ b/OpenSim/Data/MySQL/MySQLFramework.cs
@@ -40,6 +40,8 @@ namespace OpenSim.Data.MySQL
     /// </summary>
     public class MySqlFramework
     {
+        private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+
         protected MySqlConnection m_Connection;
 
         protected MySqlFramework(string connectionString)
@@ -70,12 +72,11 @@ namespace OpenSim.Data.MySQL
                     }
                     catch (MySqlException e)
                     {
-Console.WriteLine(e.ToString());
+                        m_log.Error(e.Message, e);
                         if (errorSeen)
                             throw;
 
                         // This is "Server has gone away" and "Server lost"
-                        //
                         if (e.Number == 2006 || e.Number == 2013)
                         {
                             errorSeen = true;
@@ -94,7 +95,7 @@ Console.WriteLine(e.ToString());
                     }
                     catch (Exception e)
                     {
-Console.WriteLine(e.ToString());
+                        m_log.Error(e.Message, e);
                         return 0;
                     }
                 }
@@ -112,12 +113,5 @@ Console.WriteLine(e.ToString());
 
             return cmd.ExecuteReader();
         }
-
-        protected void CloseReaderCommand(MySqlCommand cmd)
-        {
-            cmd.Connection.Close();
-            cmd.Connection.Dispose();
-            cmd.Dispose();
-        }
     }
 }
diff --git a/OpenSim/Data/MySQL/MySQLGridData.cs b/OpenSim/Data/MySQL/MySQLGridData.cs
index 1ec2609..38cb3b7 100644
--- a/OpenSim/Data/MySQL/MySQLGridData.cs
+++ b/OpenSim/Data/MySQL/MySQLGridData.cs
@@ -197,29 +197,27 @@ namespace OpenSim.Data.MySQL
                     param["?xmax"] = xmax.ToString();
                     param["?ymax"] = ymax.ToString();
 
-                    IDbCommand result =
-                        dbm.Manager.Query(
+                    using (IDbCommand result = dbm.Manager.Query(
                             "SELECT * FROM regions WHERE locX >= ?xmin AND locX <= ?xmax AND locY >= ?ymin AND locY <= ?ymax",
-                            param);
-                    IDataReader reader = result.ExecuteReader();
+                            param))
+                    {
+                        using (IDataReader reader = result.ExecuteReader())
+                        {
+                            RegionProfileData row;
 
-                    RegionProfileData row;
+                            List<RegionProfileData> rows = new List<RegionProfileData>();
 
-                    List<RegionProfileData> rows = new List<RegionProfileData>();
+                            while ((row = dbm.Manager.readSimRow(reader)) != null)
+                                rows.Add(row);
 
-                    while ((row = dbm.Manager.readSimRow(reader)) != null)
-                    {
-                        rows.Add(row);
+                            return rows.ToArray();
+                        }
                     }
-                    reader.Close();
-                    result.Dispose();
-
-                    return rows.ToArray();
             }
             catch (Exception e)
             {
                 dbm.Manager.Reconnect();
-                m_log.Error(e.ToString());
+                m_log.Error(e.Message, e);
                 return null;
             }
             finally
@@ -243,29 +241,27 @@ namespace OpenSim.Data.MySQL
                 Dictionary<string, object> param = new Dictionary<string, object>();
                 param["?name"] = namePrefix + "%";
 
-                IDbCommand result =
-                    dbm.Manager.Query(
-                        "SELECT * FROM regions WHERE regionName LIKE ?name",
-                        param);
-                IDataReader reader = result.ExecuteReader();
+                using (IDbCommand result = dbm.Manager.Query(
+                    "SELECT * FROM regions WHERE regionName LIKE ?name",
+                    param))
+                {
+                    using (IDataReader reader = result.ExecuteReader())
+                    {
+                        RegionProfileData row;
 
-                RegionProfileData row;
+                        List<RegionProfileData> rows = new List<RegionProfileData>();
 
-                List<RegionProfileData> rows = new List<RegionProfileData>();
+                        while (rows.Count < maxNum && (row = dbm.Manager.readSimRow(reader)) != null)
+                            rows.Add(row);
 
-                while (rows.Count < maxNum && (row = dbm.Manager.readSimRow(reader)) != null)
-                {
-                    rows.Add(row);
+                        return rows;
+                    }
                 }
-                reader.Close();
-                result.Dispose();
-
-                return rows;
             }
             catch (Exception e)
             {
                 dbm.Manager.Reconnect();
-                m_log.Error(e.ToString());
+                m_log.Error(e.Message, e);
                 return null;
             }
             finally
@@ -286,21 +282,21 @@ namespace OpenSim.Data.MySQL
             try
             {
                 Dictionary<string, object> param = new Dictionary<string, object>();
-                    param["?handle"] = handle.ToString();
-
-                    IDbCommand result = dbm.Manager.Query("SELECT * FROM regions WHERE regionHandle = ?handle", param);
-                    IDataReader reader = result.ExecuteReader();
+                param["?handle"] = handle.ToString();
 
-                    RegionProfileData row = dbm.Manager.readSimRow(reader);
-                    reader.Close();
-                    result.Dispose();
-
-                    return row;
+                using (IDbCommand result = dbm.Manager.Query("SELECT * FROM regions WHERE regionHandle = ?handle", param))
+                {
+                    using (IDataReader reader = result.ExecuteReader())
+                    {
+                        RegionProfileData row = dbm.Manager.readSimRow(reader);
+                        return row;
+                    }
                 }
+            }
             catch (Exception e)
             {
                 dbm.Manager.Reconnect();
-                m_log.Error(e.ToString());
+                m_log.Error(e.Message, e);
                 return null;
             }
             finally
@@ -321,23 +317,24 @@ namespace OpenSim.Data.MySQL
             try
             {
                 Dictionary<string, object> param = new Dictionary<string, object>();
-                    param["?uuid"] = uuid.ToString();
+                param["?uuid"] = uuid.ToString();
 
-                    IDbCommand result = dbm.Manager.Query("SELECT * FROM regions WHERE uuid = ?uuid", param);
-                    IDataReader reader = result.ExecuteReader();
-
-                    RegionProfileData row = dbm.Manager.readSimRow(reader);
-                    reader.Close();
-                    result.Dispose();
-
-                    return row;
+                using (IDbCommand result = dbm.Manager.Query("SELECT * FROM regions WHERE uuid = ?uuid", param))
+                {
+                    using (IDataReader reader = result.ExecuteReader())
+                    {
+                        RegionProfileData row = dbm.Manager.readSimRow(reader);
+                        return row;
+                    }
                 }
+            }
             catch (Exception e)
             {
                 dbm.Manager.Reconnect();
-                m_log.Error(e.ToString());
+                m_log.Error(e.Message, e);
                 return null;
-            } finally
+            }
+            finally
             {
                 dbm.Release();
             }
@@ -359,22 +356,21 @@ namespace OpenSim.Data.MySQL
                     // Add % because this is a like query.
                     param["?regionName"] = regionName + "%";
                     // Order by statement will return shorter matches first.  Only returns one record or no record.
-                    IDbCommand result =
-                        dbm.Manager.Query(
-                            "SELECT * FROM regions WHERE regionName like ?regionName order by LENGTH(regionName) asc LIMIT 1",
-                            param);
-                    IDataReader reader = result.ExecuteReader();
-
-                    RegionProfileData row = dbm.Manager.readSimRow(reader);
-                    reader.Close();
-                    result.Dispose();
-
-                    return row;
+                    using (IDbCommand result = dbm.Manager.Query(
+                        "SELECT * FROM regions WHERE regionName like ?regionName order by LENGTH(regionName) asc LIMIT 1",
+                        param))
+                    {
+                        using (IDataReader reader = result.ExecuteReader())
+                        {
+                            RegionProfileData row = dbm.Manager.readSimRow(reader);
+                            return row;
+                        }
+                    }
                 }
                 catch (Exception e)
                 {
                     dbm.Manager.Reconnect();
-                    m_log.Error(e.ToString());
+                    m_log.Error(e.Message, e);
                     return null;
                 }
                 finally
@@ -382,6 +378,7 @@ namespace OpenSim.Data.MySQL
                     dbm.Release();
                 }
             }
+
             m_log.Error("[GRID DB]: Searched for a Region Name shorter then 3 characters");
             return null;
         }
@@ -394,12 +391,12 @@ namespace OpenSim.Data.MySQL
         override public DataResponse StoreProfile(RegionProfileData profile)
         {
             MySQLSuperManager dbm = GetLockedConnection();
-            try {
+            try
+            {
                 if (dbm.Manager.insertRegion(profile))
-                {
                     return DataResponse.RESPONSE_OK;
-                }
-                return DataResponse.RESPONSE_ERROR;
+                else
+                   return DataResponse.RESPONSE_ERROR;
             }
             finally
             {
@@ -417,14 +414,14 @@ namespace OpenSim.Data.MySQL
         {
             MySQLSuperManager dbm = GetLockedConnection();
 
-
-            try {
+            try
+            {
                 if (dbm.Manager.deleteRegion(uuid))
-                {
                     return DataResponse.RESPONSE_OK;
-                }
-                return DataResponse.RESPONSE_ERROR;
-            } finally
+                else
+                    return DataResponse.RESPONSE_ERROR;
+            }
+            finally
             {
                 dbm.Release();
             }
@@ -482,26 +479,26 @@ namespace OpenSim.Data.MySQL
             try
             {
                 Dictionary<string, object> param = new Dictionary<string, object>();
-                    param["?x"] = x.ToString();
-                    param["?y"] = y.ToString();
-                    IDbCommand result =
-                        dbm.Manager.Query(
-                            "SELECT * FROM reservations WHERE resXMin <= ?x AND resXMax >= ?x AND resYMin <= ?y AND resYMax >= ?y",
-                            param);
-                    IDataReader reader = result.ExecuteReader();
-
-                    ReservationData row = dbm.Manager.readReservationRow(reader);
-                    reader.Close();
-                    result.Dispose();
-
-                    return row;
+                param["?x"] = x.ToString();
+                param["?y"] = y.ToString();
+                using (IDbCommand result = dbm.Manager.Query(
+                    "SELECT * FROM reservations WHERE resXMin <= ?x AND resXMax >= ?x AND resYMin <= ?y AND resYMax >= ?y",
+                    param))
+                {
+                    using (IDataReader reader = result.ExecuteReader())
+                    {
+                        ReservationData row = dbm.Manager.readReservationRow(reader);
+                        return row;
+                    }
+                }
             }
             catch (Exception e)
             {
                 dbm.Manager.Reconnect();
-                m_log.Error(e.ToString());
+                m_log.Error(e.Message, e);
                 return null;
-            } finally
+            }
+            finally
             {
                 dbm.Release();
             }
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs
index 0eecf06..598971d 100644
--- a/OpenSim/Data/MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs
@@ -135,30 +135,30 @@ namespace OpenSim.Data.MySQL
 
                     database.CheckConnection();
 
-                    MySqlCommand result =
-                        new MySqlCommand("SELECT * FROM inventoryitems WHERE parentFolderID = ?uuid",
-                                         database.Connection);
-                    result.Parameters.AddWithValue("?uuid", folderID.ToString());
-                    MySqlDataReader reader = result.ExecuteReader();
-
-                    while (reader.Read()) 
+                    using (MySqlCommand result = new MySqlCommand("SELECT * FROM inventoryitems WHERE parentFolderID = ?uuid",
+                        database.Connection))
                     {
-                        // A null item (because something went wrong) breaks everything in the folder
-                        InventoryItemBase item = readInventoryItem(reader);
-                        if (item != null)
-                            items.Add(item);
-                    }
+                        result.Parameters.AddWithValue("?uuid", folderID.ToString());
 
-                    reader.Close();
-                    result.Dispose();
+                        using (MySqlDataReader reader = result.ExecuteReader())
+                        {
+                            while (reader.Read())
+                            {
+                                // A null item (because something went wrong) breaks everything in the folder
+                                InventoryItemBase item = readInventoryItem(reader);
+                                if (item != null)
+                                    items.Add(item);
+                            }
 
-                    return items;
+                            return items;
+                        }
+                    }
                 }
             }
             catch (Exception e)
             {
                 database.Reconnect();
-                m_log.Error(e.ToString());
+                m_log.Error(e.Message, e);
                 return null;
             }
         }
@@ -176,29 +176,28 @@ namespace OpenSim.Data.MySQL
                 {
                     database.CheckConnection();
 
-                    MySqlCommand result =
-                        new MySqlCommand(
-                            "SELECT * FROM inventoryfolders WHERE parentFolderID = ?zero AND agentID = ?uuid",
-                            database.Connection);
-                    result.Parameters.AddWithValue("?uuid", user.ToString());
-                    result.Parameters.AddWithValue("?zero", UUID.Zero.ToString());
-                    MySqlDataReader reader = result.ExecuteReader();
-
-                    List<InventoryFolderBase> items = new List<InventoryFolderBase>();
-                    while (reader.Read())
-                        items.Add(readInventoryFolder(reader));
-
+                    using (MySqlCommand result = new MySqlCommand(
+                        "SELECT * FROM inventoryfolders WHERE parentFolderID = ?zero AND agentID = ?uuid",
+                        database.Connection))
+                    {
+                        result.Parameters.AddWithValue("?uuid", user.ToString());
+                        result.Parameters.AddWithValue("?zero", UUID.Zero.ToString());
 
-                    reader.Close();
-                    result.Dispose();
+                        using (MySqlDataReader reader = result.ExecuteReader())
+                        {
+                            List<InventoryFolderBase> items = new List<InventoryFolderBase>();
+                            while (reader.Read())
+                                items.Add(readInventoryFolder(reader));
 
-                    return items;
+                            return items;
+                        }
+                    }
                 }
             }
             catch (Exception e)
             {
                 database.Reconnect();
-                m_log.Error(e.ToString());
+                m_log.Error(e.Message, e);
                 return null;
             }
         }
@@ -217,41 +216,38 @@ namespace OpenSim.Data.MySQL
                 {
                     database.CheckConnection();
 
-                    MySqlCommand result =
-                        new MySqlCommand(
-                            "SELECT * FROM inventoryfolders WHERE parentFolderID = ?zero AND agentID = ?uuid",
-                            database.Connection);
-                    result.Parameters.AddWithValue("?uuid", user.ToString());
-                    result.Parameters.AddWithValue("?zero", UUID.Zero.ToString());
+                    using (MySqlCommand result = new MySqlCommand(
+                        "SELECT * FROM inventoryfolders WHERE parentFolderID = ?zero AND agentID = ?uuid",
+                        database.Connection))
+                    {
+                        result.Parameters.AddWithValue("?uuid", user.ToString());
+                        result.Parameters.AddWithValue("?zero", UUID.Zero.ToString());
 
-                    MySqlDataReader reader = result.ExecuteReader();
+                        using (MySqlDataReader reader = result.ExecuteReader())
+                        {
+                            List<InventoryFolderBase> items = new List<InventoryFolderBase>();
+                            while (reader.Read())
+                                items.Add(readInventoryFolder(reader));
 
-                    List<InventoryFolderBase> items = new List<InventoryFolderBase>();
-                    while (reader.Read())
-                        items.Add(readInventoryFolder(reader));
+                            InventoryFolderBase rootFolder = null;
 
-                    InventoryFolderBase rootFolder = null;
+                            // There should only ever be one root folder for a user.  However, if there's more
+                            // than one we'll simply use the first one rather than failing.  It would be even
+                            // nicer to print some message to this effect, but this feels like it's too low a
+                            // to put such a message out, and it's too minor right now to spare the time to
+                            // suitably refactor.
+                            if (items.Count > 0)
+                                rootFolder = items[0];
 
-                    // There should only ever be one root folder for a user.  However, if there's more
-                    // than one we'll simply use the first one rather than failing.  It would be even
-                    // nicer to print some message to this effect, but this feels like it's too low a
-                    // to put such a message out, and it's too minor right now to spare the time to
-                    // suitably refactor.
-                    if (items.Count > 0)
-                    {
-                        rootFolder = items[0];
+                            return rootFolder;
+                        }
                     }
-
-                    reader.Close();
-                    result.Dispose();
-
-                    return rootFolder;
                 }
             }
             catch (Exception e)
             {
                 database.Reconnect();
-                m_log.Error(e.ToString());
+                m_log.Error(e.Message, e);
                 return null;
             }
         }
@@ -271,27 +267,26 @@ namespace OpenSim.Data.MySQL
                 {
                     database.CheckConnection();
 
-                    MySqlCommand result =
-                        new MySqlCommand("SELECT * FROM inventoryfolders WHERE parentFolderID = ?uuid",
-                                         database.Connection);
-                    result.Parameters.AddWithValue("?uuid", parentID.ToString());
-                    MySqlDataReader reader = result.ExecuteReader();
-
-                    List<InventoryFolderBase> items = new List<InventoryFolderBase>();
-
-                    while (reader.Read())
-                        items.Add(readInventoryFolder(reader));
+                    using (MySqlCommand result = new MySqlCommand("SELECT * FROM inventoryfolders WHERE parentFolderID = ?uuid",
+                        database.Connection))
+                    {
+                        result.Parameters.AddWithValue("?uuid", parentID.ToString());
+                        using (MySqlDataReader reader = result.ExecuteReader())
+                        {
+                            List<InventoryFolderBase> items = new List<InventoryFolderBase>();
 
-                    reader.Close();
-                    result.Dispose();
+                            while (reader.Read())
+                                items.Add(readInventoryFolder(reader));
 
-                    return items;
+                            return items;
+                        }
+                    }
                 }
             }
             catch (Exception e)
             {
                 database.Reconnect();
-                m_log.Error(e.ToString());
+                m_log.Error(e.Message, e);
                 return null;
             }
         }
@@ -370,25 +365,25 @@ namespace OpenSim.Data.MySQL
                 {
                     database.CheckConnection();
 
-                    MySqlCommand result =
-                        new MySqlCommand("SELECT * FROM inventoryitems WHERE inventoryID = ?uuid", database.Connection);
-                    result.Parameters.AddWithValue("?uuid", itemID.ToString());
-                    MySqlDataReader reader = result.ExecuteReader();
-
-                    InventoryItemBase item = null;
-                    if (reader.Read())
-                        item = readInventoryItem(reader);
+                    using (MySqlCommand result = new MySqlCommand("SELECT * FROM inventoryitems WHERE inventoryID = ?uuid", database.Connection))
+                    {
+                        result.Parameters.AddWithValue("?uuid", itemID.ToString());
 
-                    reader.Close();
-                    result.Dispose();
+                        using (MySqlDataReader reader = result.ExecuteReader())
+                        {
+                            InventoryItemBase item = null;
+                            if (reader.Read())
+                                item = readInventoryItem(reader);
 
-                    return item;
+                            return item;
+                        }
+                    }
                 }
             }
             catch (Exception e)
             {
                 database.Reconnect();
-                m_log.Error(e.ToString());
+                m_log.Error(e.Message, e);
             }
             return null;
         }
@@ -413,7 +408,7 @@ namespace OpenSim.Data.MySQL
             }
             catch (Exception e)
             {
-                m_log.Error(e.ToString());
+                m_log.Error(e.Message, e);
             }
 
             return null;
@@ -433,24 +428,25 @@ namespace OpenSim.Data.MySQL
                 {
                     database.CheckConnection();
 
-                    MySqlCommand result =
-                        new MySqlCommand("SELECT * FROM inventoryfolders WHERE folderID = ?uuid", database.Connection);
-                    result.Parameters.AddWithValue("?uuid", folderID.ToString());
-                    MySqlDataReader reader = result.ExecuteReader();
+                    using (MySqlCommand result = new MySqlCommand("SELECT * FROM inventoryfolders WHERE folderID = ?uuid", database.Connection))
+                    {
+                        result.Parameters.AddWithValue("?uuid", folderID.ToString());
 
-                    InventoryFolderBase folder = null;
-                    if (reader.Read())
-                         folder = readInventoryFolder(reader);
-                    reader.Close();
-                    result.Dispose();
+                        using (MySqlDataReader reader = result.ExecuteReader())
+                        {
+                            InventoryFolderBase folder = null;
+                            if (reader.Read())
+                                folder = readInventoryFolder(reader);
 
-                    return folder;
+                            return folder;
+                        }
+                    }
                 }
             }
             catch (Exception e)
             {
                 database.Reconnect();
-                m_log.Error(e.ToString());
+                m_log.Error(e.Message, e);
                 return null;
             }
         }
@@ -698,69 +694,73 @@ namespace OpenSim.Data.MySQL
             try
             {
                 List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
-                Dictionary<UUID, List<InventoryFolderBase>> hashtable
-                    = new Dictionary<UUID, List<InventoryFolderBase>>(); ;
+                Dictionary<UUID, List<InventoryFolderBase>> hashtable = new Dictionary<UUID, List<InventoryFolderBase>>(); ;
                 List<InventoryFolderBase> parentFolder = new List<InventoryFolderBase>();
+                bool buildResultsFromHashTable = false;
+
                 lock (database)
                 {
-                    MySqlCommand result;
-                    MySqlDataReader reader;
-                    bool buildResultsFromHashTable = false;
-
                     database.CheckConnection();
 
                     /* Fetch the parent folder from the database to determine the agent ID, and if
                      * we're querying the root of the inventory folder tree */
-                    result = new MySqlCommand("SELECT * FROM inventoryfolders WHERE folderID = ?uuid",
-                                              database.Connection);
-                    result.Parameters.AddWithValue("?uuid", parentID.ToString());
-                    reader = result.ExecuteReader();
-                    while (reader.Read())          // Should be at most 1 result
-                        parentFolder.Add(readInventoryFolder(reader));
-                    reader.Close();
-                    result.Dispose();
+                    using (MySqlCommand result = new MySqlCommand("SELECT * FROM inventoryfolders WHERE folderID = ?uuid", database.Connection))
+                    {
+                        result.Parameters.AddWithValue("?uuid", parentID.ToString());
+
+                        using (MySqlDataReader reader = result.ExecuteReader())
+                        {
+                            // Should be at most 1 result
+                            while (reader.Read())
+                                parentFolder.Add(readInventoryFolder(reader));
+                        }
+                    }
 
                     if (parentFolder.Count >= 1)   // No result means parent folder does not exist
                     {
                         if (parentFolder[0].ParentID == UUID.Zero) // We are querying the root folder
                         {
                             /* Get all of the agent's folders from the database, put them in a list and return it */
-                            result = new MySqlCommand("SELECT * FROM inventoryfolders WHERE agentID = ?uuid",
-                                                      database.Connection);
-                            result.Parameters.AddWithValue("?uuid", parentFolder[0].Owner.ToString());
-                            reader = result.ExecuteReader();
-                            while (reader.Read())
+                            using (MySqlCommand result = new MySqlCommand("SELECT * FROM inventoryfolders WHERE agentID = ?uuid", database.Connection))
                             {
-                                InventoryFolderBase curFolder = readInventoryFolder(reader);
-                                if (curFolder.ID != parentID) // Do not need to add the root node of the tree to the list
-                                    folders.Add(curFolder);
+                                result.Parameters.AddWithValue("?uuid", parentFolder[0].Owner.ToString());
+
+                                using (MySqlDataReader reader = result.ExecuteReader())
+                                {
+                                    while (reader.Read())
+                                    {
+                                        InventoryFolderBase curFolder = readInventoryFolder(reader);
+                                        if (curFolder.ID != parentID) // Do not need to add the root node of the tree to the list
+                                            folders.Add(curFolder);
+                                    }
+                                }
                             }
-                            reader.Close();
-                            result.Dispose();
                         } // if we are querying the root folder
                         else // else we are querying a subtree of the inventory folder tree
                         {
                             /* Get all of the agent's folders from the database, put them all in a hash table
                              * indexed by their parent ID */
-                            result = new MySqlCommand("SELECT * FROM inventoryfolders WHERE agentID = ?uuid",
-                                                      database.Connection);
-                            result.Parameters.AddWithValue("?uuid", parentFolder[0].Owner.ToString());
-                            reader = result.ExecuteReader();
-                            while (reader.Read())
+                            using (MySqlCommand result = new MySqlCommand("SELECT * FROM inventoryfolders WHERE agentID = ?uuid", database.Connection))
                             {
-                                InventoryFolderBase curFolder = readInventoryFolder(reader);
-                                if (hashtable.ContainsKey(curFolder.ParentID))      // Current folder already has a sibling
-                                    hashtable[curFolder.ParentID].Add(curFolder);   // append to sibling list
-                                else // else current folder has no known (yet) siblings
+                                result.Parameters.AddWithValue("?uuid", parentFolder[0].Owner.ToString());
+
+                                using (MySqlDataReader reader = result.ExecuteReader())
                                 {
-                                    List<InventoryFolderBase> siblingList = new List<InventoryFolderBase>();
-                                    siblingList.Add(curFolder);
-                                    // Current folder has no known (yet) siblings
-                                    hashtable.Add(curFolder.ParentID, siblingList);
+                                    while (reader.Read())
+                                    {
+                                        InventoryFolderBase curFolder = readInventoryFolder(reader);
+                                        if (hashtable.ContainsKey(curFolder.ParentID))      // Current folder already has a sibling
+                                            hashtable[curFolder.ParentID].Add(curFolder);   // append to sibling list
+                                        else // else current folder has no known (yet) siblings
+                                        {
+                                            List<InventoryFolderBase> siblingList = new List<InventoryFolderBase>();
+                                            siblingList.Add(curFolder);
+                                            // Current folder has no known (yet) siblings
+                                            hashtable.Add(curFolder.ParentID, siblingList);
+                                        }
+                                    } // while more items to read from the database
                                 }
-                            } // while more items to read from the database
-                            reader.Close();
-                            result.Dispose();
+                            }
 
                             // Set flag so we know we need to build the results from the hash table after
                             // we unlock the database
@@ -781,12 +781,13 @@ namespace OpenSim.Data.MySQL
                                 folders.AddRange(hashtable[folders[i].ID]);
                     }
                 } // lock (database)
+
                 return folders;
             }
             catch (Exception e)
             {
                 database.Reconnect();
-                m_log.Error(e.ToString());
+                m_log.Error(e.Message, e);
                 return null;
             }
         }
@@ -801,19 +802,18 @@ namespace OpenSim.Data.MySQL
             {
                 database.CheckConnection();
 
-                MySqlCommand cmd =
-                    new MySqlCommand("DELETE FROM inventoryfolders WHERE folderID=?uuid", database.Connection);
-                cmd.Parameters.AddWithValue("?uuid", folderID.ToString());
-
-                lock (database)
+                using (MySqlCommand cmd = new MySqlCommand("DELETE FROM inventoryfolders WHERE folderID=?uuid", database.Connection))
                 {
-                    cmd.ExecuteNonQuery();
+                    cmd.Parameters.AddWithValue("?uuid", folderID.ToString());
+
+                    lock (database)
+                        cmd.ExecuteNonQuery();
                 }
             }
             catch (MySqlException e)
             {
                 database.Reconnect();
-                m_log.Error(e.ToString());
+                m_log.Error(e.Message, e);
             }
         }
 
@@ -827,13 +827,12 @@ namespace OpenSim.Data.MySQL
             {
                 database.CheckConnection();
 
-                MySqlCommand cmd =
-                    new MySqlCommand("DELETE FROM inventoryitems WHERE parentFolderID=?uuid", database.Connection);
-                cmd.Parameters.AddWithValue("?uuid", folderID.ToString());
-
-                lock (database)
+                using (MySqlCommand cmd = new MySqlCommand("DELETE FROM inventoryitems WHERE parentFolderID=?uuid", database.Connection))
                 {
-                    cmd.ExecuteNonQuery();
+                    cmd.Parameters.AddWithValue("?uuid", folderID.ToString());
+
+                    lock (database)
+                        cmd.ExecuteNonQuery();
                 }
             }
             catch (MySqlException e)
@@ -865,40 +864,38 @@ namespace OpenSim.Data.MySQL
         
         public List<InventoryItemBase> fetchActiveGestures(UUID avatarID)
         {
-            MySqlDataReader result = null;
-            MySqlCommand sqlCmd = null;
             lock (database)
             {
                 try
                 {
                     database.CheckConnection();
-                    sqlCmd = new MySqlCommand(
-                        "SELECT * FROM inventoryitems WHERE avatarId = ?uuid AND assetType = ?type and flags = 1",
-                        database.Connection);
-                    sqlCmd.Parameters.AddWithValue("?uuid", avatarID.ToString());
-                    sqlCmd.Parameters.AddWithValue("?type", (int)AssetType.Gesture);
-                    result = sqlCmd.ExecuteReader();
 
-                    List<InventoryItemBase> list = new List<InventoryItemBase>();
-                    while (result.Read())
+                    using (MySqlCommand sqlCmd = new MySqlCommand(
+                        "SELECT * FROM inventoryitems WHERE avatarId = ?uuid AND assetType = ?type and flags = 1",
+                        database.Connection))
                     {
-                        InventoryItemBase item = readInventoryItem(result);
-                        if (item != null)
-                            list.Add(item);
+                        sqlCmd.Parameters.AddWithValue("?uuid", avatarID.ToString());
+                        sqlCmd.Parameters.AddWithValue("?type", (int)AssetType.Gesture);
+
+                        using (MySqlDataReader result = sqlCmd.ExecuteReader())
+                        {
+                            List<InventoryItemBase> list = new List<InventoryItemBase>();
+                            while (result.Read())
+                            {
+                                InventoryItemBase item = readInventoryItem(result);
+                                if (item != null)
+                                    list.Add(item);
+                            }
+                            return list;
+                        }
                     }
-                    return list;
                 }
                 catch (Exception e)
                 {
                     database.Reconnect();
-                    m_log.Error(e.ToString());
+                    m_log.Error(e.Message, e);
                     return null;
                 }
-                finally
-                {
-                    if (result != null) result.Close();
-                    if (sqlCmd != null) sqlCmd.Dispose();
-                }
             }
         }
     }
diff --git a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
index f25bfd7..fe0914b 100644
--- a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
@@ -268,6 +268,8 @@ namespace OpenSim.Data.MySQL
 
         public void RemoveObject(UUID obj, UUID regionUUID)
         {
+            List<UUID> uuids = new List<UUID>();
+
             // Formerly, this used to check the region UUID.
             // That makes no sense, as we remove the contents of a prim
             // unconditionally, but the prim dependent on the region ID.
@@ -278,43 +280,31 @@ namespace OpenSim.Data.MySQL
             //
             lock (m_Connection)
             {
-                MySqlCommand cmd = m_Connection.CreateCommand();
-
-                cmd.CommandText = "select UUID from prims where "+
-                        "SceneGroupID= ?UUID";
-
-                cmd.Parameters.AddWithValue("UUID", obj.ToString());
-
-                List<UUID> uuids = new List<UUID>();
-
-                IDataReader reader = ExecuteReader(cmd);
-
-                try
+                using (MySqlCommand cmd = m_Connection.CreateCommand())
                 {
-                    while (reader.Read())
+                    cmd.CommandText = "select UUID from prims where SceneGroupID= ?UUID";
+                    cmd.Parameters.AddWithValue("UUID", obj.ToString());
+
+                    using (IDataReader reader = ExecuteReader(cmd))
                     {
-                        uuids.Add(new UUID(reader["UUID"].ToString()));
+                        while (reader.Read())
+                            uuids.Add(new UUID(reader["UUID"].ToString()));
                     }
-                }
-                finally
-                {
-                    reader.Close();
-                }
-
-                // delete the main prims
-                cmd.CommandText = "delete from prims where SceneGroupID= ?UUID";
-                ExecuteNonQuery(cmd);
-                cmd.Dispose();
 
-                // there is no way this should be < 1 unless there is
-                // a very corrupt database, but in that case be extra
-                // safe anyway.
-                if (uuids.Count > 0) 
-                {
-                    RemoveShapes(uuids);
-                    RemoveItems(uuids);
+                    // delete the main prims
+                    cmd.CommandText = "delete from prims where SceneGroupID= ?UUID";
+                    ExecuteNonQuery(cmd);
                 }
             }
+
+            // there is no way this should be < 1 unless there is
+            // a very corrupt database, but in that case be extra
+            // safe anyway.
+            if (uuids.Count > 0)
+            {
+                RemoveShapes(uuids);
+                RemoveItems(uuids);
+            }
         }
 
         /// <summary>
@@ -326,19 +316,16 @@ namespace OpenSim.Data.MySQL
         {
             lock (m_Connection)
             {
-                MySqlCommand cmd = m_Connection.CreateCommand();
-
-                cmd.CommandText = "delete from primitems where " +
-                        "PrimID = ?PrimID";
-
-                cmd.Parameters.AddWithValue("PrimID", uuid.ToString());
+                using (MySqlCommand cmd = m_Connection.CreateCommand())
+                {
+                    cmd.CommandText = "delete from primitems where PrimID = ?PrimID";
+                    cmd.Parameters.AddWithValue("PrimID", uuid.ToString());
 
-                ExecuteNonQuery(cmd);
-                cmd.Dispose();
+                    ExecuteNonQuery(cmd);
+                }
             }
         }
 
-
         /// <summary>
         /// Remove all persisted shapes for a list of prims
         /// The caller must acquire the necessrary synchronization locks
@@ -349,28 +336,27 @@ namespace OpenSim.Data.MySQL
             lock (m_Connection)
             {
                 string sql = "delete from primshapes where ";
-                MySqlCommand cmd = m_Connection.CreateCommand();
-                
-                for (int i = 0; i < uuids.Count; i++)
+
+                using (MySqlCommand cmd = m_Connection.CreateCommand())
                 {
-                    if ((i + 1) == uuids.Count) 
-                    {// end of the list
-                        sql += "(UUID = ?UUID" + i + ")";
-                    }
-                    else
+                    for (int i = 0; i < uuids.Count; i++)
                     {
-                        sql += "(UUID = ?UUID" + i + ") or ";
+                        if ((i + 1) == uuids.Count)
+                        {// end of the list
+                            sql += "(UUID = ?UUID" + i + ")";
+                        }
+                        else
+                        {
+                            sql += "(UUID = ?UUID" + i + ") or ";
+                        }
                     }
-                }
-                cmd.CommandText = sql;
+                    cmd.CommandText = sql;
 
-                for (int i = 0; i < uuids.Count; i++)
-                {
-                    cmd.Parameters.AddWithValue("UUID" + i, uuids[i].ToString());
-                }
+                    for (int i = 0; i < uuids.Count; i++)
+                        cmd.Parameters.AddWithValue("UUID" + i, uuids[i].ToString());
 
-                ExecuteNonQuery(cmd);
-                cmd.Dispose();
+                    ExecuteNonQuery(cmd);
+                }
             }
         }
 
@@ -384,28 +370,28 @@ namespace OpenSim.Data.MySQL
             lock (m_Connection)
             {
                 string sql = "delete from primitems where ";
-                MySqlCommand cmd = m_Connection.CreateCommand();
-                
-                for (int i = 0; i < uuids.Count; i++)
+
+                using (MySqlCommand cmd = m_Connection.CreateCommand())
                 {
-                    if ((i + 1) == uuids.Count) 
-                    {// end of the list
-                        sql += "(PrimID = ?PrimID" + i + ")";
-                    }
-                    else
+                    for (int i = 0; i < uuids.Count; i++)
                     {
-                        sql += "(PrimID = ?PrimID" + i + ") or ";
+                        if ((i + 1) == uuids.Count)
+                        {
+                            // end of the list
+                            sql += "(PrimID = ?PrimID" + i + ")";
+                        }
+                        else
+                        {
+                            sql += "(PrimID = ?PrimID" + i + ") or ";
+                        }
                     }
-                }
-                cmd.CommandText = sql;
+                    cmd.CommandText = sql;
 
-                for (int i = 0; i < uuids.Count; i++)
-                {
-                    cmd.Parameters.AddWithValue("PrimID" + i, uuids[i].ToString());
-                }
+                    for (int i = 0; i < uuids.Count; i++)
+                        cmd.Parameters.AddWithValue("PrimID" + i, uuids[i].ToString());
 
-                ExecuteNonQuery(cmd);
-                cmd.Dispose();
+                    ExecuteNonQuery(cmd);
+                }
             }
         }
 
@@ -418,77 +404,71 @@ namespace OpenSim.Data.MySQL
 
             lock (m_Connection)
             {
-                MySqlCommand cmd = m_Connection.CreateCommand();
-
-                cmd.CommandText = "select *, " +
+                using (MySqlCommand cmd = m_Connection.CreateCommand())
+                {
+                    cmd.CommandText = "select *, " +
                         "case when prims.UUID = SceneGroupID " +
                         "then 0 else 1 end as sort from prims " +
-                        "left join primshapes on prims.UUID = primshapes.UUID "+
+                        "left join primshapes on prims.UUID = primshapes.UUID " +
                         "where RegionUUID = ?RegionUUID " +
                         "order by SceneGroupID asc, sort asc, LinkNumber asc";
-                
-                cmd.Parameters.AddWithValue("RegionUUID", regionUUID.ToString());
 
-                IDataReader reader = ExecuteReader(cmd);
+                    cmd.Parameters.AddWithValue("RegionUUID", regionUUID.ToString());
 
-                try
-                {
-                    while (reader.Read())
+                    using (IDataReader reader = ExecuteReader(cmd))
                     {
-                        SceneObjectPart prim = BuildPrim(reader);
-                        if (reader["Shape"] is DBNull)
-                            prim.Shape = PrimitiveBaseShape.Default;
-                        else
-                            prim.Shape = BuildShape(reader);
+                        while (reader.Read())
+                        {
+                            SceneObjectPart prim = BuildPrim(reader);
+                            if (reader["Shape"] is DBNull)
+                                prim.Shape = PrimitiveBaseShape.Default;
+                            else
+                                prim.Shape = BuildShape(reader);
 
-                        prims[prim.UUID] = prim;
+                            prims[prim.UUID] = prim;
 
-                        UUID groupID = new UUID(reader["SceneGroupID"].ToString());
+                            UUID groupID = new UUID(reader["SceneGroupID"].ToString());
 
-                        if (groupID != lastGroupID) // New SOG
-                        {
-                            if (grp != null)
-                                objects[grp.UUID] = grp;
-
-                            lastGroupID = groupID;
-                            
-                            // There sometimes exist OpenSim bugs that 'orphan groups' so that none of the prims are
-                            // recorded as the root prim (for which the UUID must equal the persisted group UUID).  In
-                            // this case, force the UUID to be the same as the group UUID so that at least these can be
-                            // deleted (we need to change the UUID so that any other prims in the linkset can also be 
-                            // deleted).
-                            if (prim.UUID != groupID && groupID != UUID.Zero)
+                            if (groupID != lastGroupID) // New SOG
                             {
-                                m_log.WarnFormat(
-                                    "[REGION DB]: Found root prim {0} {1} at {2} where group was actually {3}.  Forcing UUID to group UUID", 
-                                    prim.Name, prim.UUID, prim.GroupPosition, groupID);
-                                
-                                prim.UUID = groupID;
+                                if (grp != null)
+                                    objects[grp.UUID] = grp;
+
+                                lastGroupID = groupID;
+
+                                // There sometimes exist OpenSim bugs that 'orphan groups' so that none of the prims are
+                                // recorded as the root prim (for which the UUID must equal the persisted group UUID).  In
+                                // this case, force the UUID to be the same as the group UUID so that at least these can be
+                                // deleted (we need to change the UUID so that any other prims in the linkset can also be 
+                                // deleted).
+                                if (prim.UUID != groupID && groupID != UUID.Zero)
+                                {
+                                    m_log.WarnFormat(
+                                        "[REGION DB]: Found root prim {0} {1} at {2} where group was actually {3}.  Forcing UUID to group UUID",
+                                        prim.Name, prim.UUID, prim.GroupPosition, groupID);
+
+                                    prim.UUID = groupID;
+                                }
+
+                                grp = new SceneObjectGroup(prim);
                             }
+                            else
+                            {
+                                // Black magic to preserve link numbers
+                                //
+                                int link = prim.LinkNum;
 
-                            grp = new SceneObjectGroup(prim);
-                        }
-                        else
-                        {
-                            // Black magic to preserve link numbers
-                            //
-                            int link = prim.LinkNum;
-
-                            grp.AddPart(prim);
+                                grp.AddPart(prim);
 
-                            if (link != 0)
-                                prim.LinkNum = link;
+                                if (link != 0)
+                                    prim.LinkNum = link;
+                            }
                         }
                     }
-                }
-                finally
-                {
-                    reader.Close();
-                }
 
-                if (grp != null)
-                    objects[grp.UUID] = grp;
-                cmd.Dispose();
+                    if (grp != null)
+                        objects[grp.UUID] = grp;
+                }
             }
 
             // Instead of attempting to LoadItems on every prim,
@@ -498,34 +478,29 @@ namespace OpenSim.Data.MySQL
             List<SceneObjectPart> primsWithInventory = new List<SceneObjectPart>();
             lock (m_Connection)
             {
-                MySqlCommand itemCmd = m_Connection.CreateCommand();
-                itemCmd.CommandText = "select distinct primID from primitems";
-                IDataReader itemReader = ExecuteReader(itemCmd);
-                try
+                using (MySqlCommand itemCmd = m_Connection.CreateCommand())
                 {
-                    while (itemReader.Read())
+                    itemCmd.CommandText = "select distinct primID from primitems";
+                    using (IDataReader itemReader = ExecuteReader(itemCmd))
                     {
-                        if (!(itemReader["primID"] is DBNull))
+                        while (itemReader.Read())
                         {
-                            UUID primID = new UUID(itemReader["primID"].ToString());
-                            if (prims.ContainsKey(primID))
+                            if (!(itemReader["primID"] is DBNull))
                             {
-                                primsWithInventory.Add(prims[primID]);
+                                UUID primID = new UUID(itemReader["primID"].ToString());
+                                if (prims.ContainsKey(primID))
+                                {
+                                    primsWithInventory.Add(prims[primID]);
+                                }
                             }
                         }
                     }
                 }
-                finally
-                {
-                    itemReader.Close();
-                }
-                itemCmd.Dispose();
             }
 
             foreach (SceneObjectPart prim in primsWithInventory)
-            {
                 LoadItems(prim);
-            }
+
             m_log.DebugFormat("[REGION DB]: Loaded {0} objects using {1} prims", objects.Count, prims.Count);
             return new List<SceneObjectGroup>(objects.Values);
         }
@@ -538,34 +513,25 @@ namespace OpenSim.Data.MySQL
         {
             lock (m_Connection)
             {
-                MySqlCommand cmd = m_Connection.CreateCommand();
-
-                cmd.CommandText = "select * from primitems where "+
-                        "PrimID = ?PrimID";
+                List<TaskInventoryItem> inventory = new List<TaskInventoryItem>();
 
-                cmd.Parameters.AddWithValue("PrimID", prim.UUID.ToString());
-
-                IDataReader reader = ExecuteReader(cmd);
-                List<TaskInventoryItem> inventory =
-                        new List<TaskInventoryItem>();
-
-                try
+                using (MySqlCommand cmd = m_Connection.CreateCommand())
                 {
-                    while (reader.Read())
+                    cmd.CommandText = "select * from primitems where PrimID = ?PrimID";
+                    cmd.Parameters.AddWithValue("PrimID", prim.UUID.ToString());
+
+                    using (IDataReader reader = ExecuteReader(cmd))
                     {
-                        TaskInventoryItem item = BuildItem(reader);
+                        while (reader.Read())
+                        {
+                            TaskInventoryItem item = BuildItem(reader);
 
-                        item.ParentID = prim.UUID; // Values in database are
-                                                   // often wrong
-                        inventory.Add(item);
+                            item.ParentID = prim.UUID; // Values in database are often wrong
+                            inventory.Add(item);
+                        }
                     }
                 }
-                finally
-                {
-                    reader.Close();
-                }
 
-                cmd.Dispose();
                 prim.Inventory.RestoreInventoryItems(inventory);
             }
         }
@@ -576,23 +542,21 @@ namespace OpenSim.Data.MySQL
 
             lock (m_Connection)
             {
-                MySqlCommand cmd = m_Connection.CreateCommand();
+                using (MySqlCommand cmd = m_Connection.CreateCommand())
+                {
+                    cmd.CommandText = "delete from terrain where RegionUUID = ?RegionUUID";
+                    cmd.Parameters.AddWithValue("RegionUUID", regionID.ToString());
 
-                cmd.CommandText = "delete from terrain where " +
-                        "RegionUUID = ?RegionUUID";
-                cmd.Parameters.AddWithValue("RegionUUID", regionID.ToString());
+                    ExecuteNonQuery(cmd);
 
-                ExecuteNonQuery(cmd);
-                
-                cmd.CommandText = "insert into terrain (RegionUUID, " +
+                    cmd.CommandText = "insert into terrain (RegionUUID, " +
                         "Revision, Heightfield) values (?RegionUUID, " +
                         "1, ?Heightfield)";
 
-                cmd.Parameters.AddWithValue("Heightfield",
-                        SerializeTerrain(ter));
-                
-                ExecuteNonQuery(cmd);
-                cmd.Dispose();
+                    cmd.Parameters.AddWithValue("Heightfield", SerializeTerrain(ter));
+
+                    ExecuteNonQuery(cmd);
+                }
             }
         }
 
@@ -602,42 +566,40 @@ namespace OpenSim.Data.MySQL
 
             lock (m_Connection)
             {
-                MySqlCommand cmd = m_Connection.CreateCommand();
-                cmd.CommandText = "select RegionUUID, Revision, Heightfield " +
-                        "from terrain where RegionUUID = ?RegionUUID "+
+                using (MySqlCommand cmd = m_Connection.CreateCommand())
+                {
+                    cmd.CommandText = "select RegionUUID, Revision, Heightfield " +
+                        "from terrain where RegionUUID = ?RegionUUID " +
                         "order by Revision desc limit 1";
-                cmd.Parameters.AddWithValue("RegionUUID", regionID.ToString());
-
-                IDataReader reader = ExecuteReader(cmd);
+                    cmd.Parameters.AddWithValue("RegionUUID", regionID.ToString());
 
-                try
-                {
-                    while (reader.Read())
+                    using (IDataReader reader = ExecuteReader(cmd))
                     {
-                        terrain = new double[(int)Constants.RegionSize, (int)Constants.RegionSize];
-                        terrain.Initialize();
+                        while (reader.Read())
+                        {
+                            int rev = Convert.ToInt32(reader["Revision"]);
 
-                        MemoryStream mstr = new MemoryStream((byte[]) reader["Heightfield"]);
-                        int rev = 0;
+                            terrain = new double[(int)Constants.RegionSize, (int)Constants.RegionSize];
+                            terrain.Initialize();
 
-                        BinaryReader br = new BinaryReader(mstr);
-                        for (int x = 0; x < (int)Constants.RegionSize; x++)
-                        {
-                            for (int y = 0; y < (int)Constants.RegionSize; y++)
+                            using (MemoryStream mstr = new MemoryStream((byte[])reader["Heightfield"]))
                             {
-                                terrain[x, y] = br.ReadDouble();
+                                using (BinaryReader br = new BinaryReader(mstr))
+                                {
+                                    for (int x = 0; x < (int)Constants.RegionSize; x++)
+                                    {
+                                        for (int y = 0; y < (int)Constants.RegionSize; y++)
+                                        {
+                                            terrain[x, y] = br.ReadDouble();
+                                        }
+                                    }
+                                }
+
+                                m_log.InfoFormat("[REGION DB]: Loaded terrain revision r{0}", rev);
                             }
-                            rev = Convert.ToInt32(reader["Revision"]);
                         }
-                        m_log.InfoFormat("[REGION DB]: Loaded terrain " +
-                                "revision r{0}", rev);
                     }
                 }
-                finally
-                {
-                    reader.Close();
-                }
-                cmd.Dispose();
             }
 
             return terrain;
@@ -647,14 +609,13 @@ namespace OpenSim.Data.MySQL
         {
             lock (m_Connection)
             {
-                MySqlCommand cmd = m_Connection.CreateCommand();
-
-                cmd.CommandText = "delete from land where UUID = ?UUID";
-
-                cmd.Parameters.AddWithValue("UUID", globalID.ToString());
+                using (MySqlCommand cmd = m_Connection.CreateCommand())
+                {
+                    cmd.CommandText = "delete from land where UUID = ?UUID";
+                    cmd.Parameters.AddWithValue("UUID", globalID.ToString());
 
-                ExecuteNonQuery(cmd);
-                cmd.Dispose();
+                    ExecuteNonQuery(cmd);
+                }
             }
         }
 
@@ -662,9 +623,9 @@ namespace OpenSim.Data.MySQL
         {
             lock (m_Connection)
             {
-                MySqlCommand cmd = m_Connection.CreateCommand();
-
-                cmd.CommandText = "replace into land (UUID, RegionUUID, " +
+                using (MySqlCommand cmd = m_Connection.CreateCommand())
+                {
+                    cmd.CommandText = "replace into land (UUID, RegionUUID, " +
                         "LocalLandID, Bitmap, Name, Description, " +
                         "OwnerUUID, IsGroupOwned, Area, AuctionID, " +
                         "Category, ClaimDate, ClaimPrice, GroupUUID, " +
@@ -685,28 +646,26 @@ namespace OpenSim.Data.MySQL
                         "?UserLookAtX, ?UserLookAtY, ?UserLookAtZ, " +
                         "?AuthbuyerID, ?OtherCleanTime, ?Dwell)";
 
-                FillLandCommand(cmd, parcel.LandData, parcel.RegionUUID);
+                    FillLandCommand(cmd, parcel.LandData, parcel.RegionUUID);
 
-                ExecuteNonQuery(cmd);
-
-                cmd.CommandText = "delete from landaccesslist where " +
-                        "LandUUID = ?UUID";
-
-                ExecuteNonQuery(cmd);
+                    ExecuteNonQuery(cmd);
 
-                cmd.Parameters.Clear();
-                cmd.CommandText = "insert into landaccesslist (LandUUID, " +
-                        "AccessUUID, Flags) values (?LandUUID, ?AccessUUID, " +
-                        "?Flags)";
+                    cmd.CommandText = "delete from landaccesslist where LandUUID = ?UUID";
 
-                foreach (ParcelManager.ParcelAccessEntry entry in
-                        parcel.LandData.ParcelAccessList)
-                {
-                    FillLandAccessCommand(cmd, entry, parcel.LandData.GlobalID);
                     ExecuteNonQuery(cmd);
+
                     cmd.Parameters.Clear();
+                    cmd.CommandText = "insert into landaccesslist (LandUUID, " +
+                            "AccessUUID, Flags) values (?LandUUID, ?AccessUUID, " +
+                            "?Flags)";
+
+                    foreach (ParcelManager.ParcelAccessEntry entry in parcel.LandData.ParcelAccessList)
+                    {
+                        FillLandAccessCommand(cmd, entry, parcel.LandData.GlobalID);
+                        ExecuteNonQuery(cmd);
+                        cmd.Parameters.Clear();
+                    }
                 }
-                cmd.Dispose();
             }
         }
 
@@ -716,35 +675,28 @@ namespace OpenSim.Data.MySQL
 
             lock (m_Connection)
             {
-                MySqlCommand cmd = m_Connection.CreateCommand();
-
-                cmd.CommandText = "select * from regionsettings where " +
-                        "regionUUID = ?RegionUUID";
-                cmd.Parameters.AddWithValue("regionUUID", regionUUID);
-
-                IDataReader reader = ExecuteReader(cmd);
-
-                try
+                using (MySqlCommand cmd = m_Connection.CreateCommand())
                 {
-                    if (reader.Read())
-                    {
-                        rs = BuildRegionSettings(reader);
-                        rs.OnSave += StoreRegionSettings;
-                    }
-                    else
+                    cmd.CommandText = "select * from regionsettings where regionUUID = ?RegionUUID";
+                    cmd.Parameters.AddWithValue("regionUUID", regionUUID);
+
+                    using (IDataReader reader = ExecuteReader(cmd))
                     {
-                        rs = new RegionSettings();
-                        rs.RegionUUID = regionUUID;
-                        rs.OnSave += StoreRegionSettings;
+                        if (reader.Read())
+                        {
+                            rs = BuildRegionSettings(reader);
+                            rs.OnSave += StoreRegionSettings;
+                        }
+                        else
+                        {
+                            rs = new RegionSettings();
+                            rs.RegionUUID = regionUUID;
+                            rs.OnSave += StoreRegionSettings;
 
-                        StoreRegionSettings(rs);
+                            StoreRegionSettings(rs);
+                        }
                     }
                 }
-                finally
-                {
-                    reader.Close();
-                }
-                cmd.Dispose();
             }
 
             return rs;
@@ -754,9 +706,9 @@ namespace OpenSim.Data.MySQL
         {
             lock (m_Connection)
             {
-                MySqlCommand cmd = m_Connection.CreateCommand();
-
-                cmd.CommandText = "replace into regionsettings (regionUUID, " +
+                using (MySqlCommand cmd = m_Connection.CreateCommand())
+                {
+                    cmd.CommandText = "replace into regionsettings (regionUUID, " +
                         "block_terraform, block_fly, allow_damage, " +
                         "restrict_pushing, allow_land_resell, " +
                         "allow_land_join_divide, block_show_in_search, " +
@@ -766,8 +718,8 @@ namespace OpenSim.Data.MySQL
                         "terrain_texture_2, terrain_texture_3, " +
                         "terrain_texture_4, elevation_1_nw, " +
                         "elevation_2_nw, elevation_1_ne, " +
-                        "elevation_2_ne, elevation_1_se, "+
-                        "elevation_2_se, elevation_1_sw, "+
+                        "elevation_2_ne, elevation_1_se, " +
+                        "elevation_2_se, elevation_1_sw, " +
                         "elevation_2_sw, water_height, " +
                         "terrain_raise_limit, terrain_lower_limit, " +
                         "use_estate_sun, fixed_sun, sun_position, " +
@@ -789,11 +741,10 @@ namespace OpenSim.Data.MySQL
                         "?SunVectorX, ?SunVectorY, ?SunVectorZ, " +
                         "?LoadedCreationDateTime, ?LoadedCreationID)";
 
-                FillRegionSettingsCommand(cmd, rs);
-
-                ExecuteNonQuery(cmd);
-                cmd.Dispose();
+                    FillRegionSettingsCommand(cmd, rs);
 
+                    ExecuteNonQuery(cmd);
+                }
             }
         }
 
@@ -803,52 +754,38 @@ namespace OpenSim.Data.MySQL
 
             lock (m_Connection)
             {
-                MySqlCommand cmd = m_Connection.CreateCommand();
-
-                cmd.CommandText = "select * from land where " +
-                        "RegionUUID = ?RegionUUID";
-
-                cmd.Parameters.AddWithValue("RegionUUID", regionUUID.ToString());
-
-                IDataReader reader = ExecuteReader(cmd);
-
-                try
+                using (MySqlCommand cmd = m_Connection.CreateCommand())
                 {
-                    while (reader.Read())
+                    cmd.CommandText = "select * from land where RegionUUID = ?RegionUUID";
+                    cmd.Parameters.AddWithValue("RegionUUID", regionUUID.ToString());
+
+                    using (IDataReader reader = ExecuteReader(cmd))
                     {
-                        LandData newLand = BuildLandData(reader);
-                        landData.Add(newLand);
+                        while (reader.Read())
+                        {
+                            LandData newLand = BuildLandData(reader);
+                            landData.Add(newLand);
+                        }
                     }
                 }
-                finally
-                {
-                    reader.Close();
-                }
 
-                foreach (LandData land in landData)
+                using (MySqlCommand cmd = m_Connection.CreateCommand())
                 {
-                    cmd.Parameters.Clear();
-
-                    cmd.CommandText = "select * from landaccesslist " +
-                            "where LandUUID = ?LandUUID";
-
-                    cmd.Parameters.AddWithValue("LandUUID", land.GlobalID.ToString());
-
-                    reader = ExecuteReader(cmd);
-
-                    try
+                    foreach (LandData land in landData)
                     {
-                        while (reader.Read())
+                        cmd.Parameters.Clear();
+                        cmd.CommandText = "select * from landaccesslist where LandUUID = ?LandUUID";
+                        cmd.Parameters.AddWithValue("LandUUID", land.GlobalID.ToString());
+
+                        using (IDataReader reader = ExecuteReader(cmd))
                         {
-                            land.ParcelAccessList.Add(BuildLandAccessData(reader));
+                            while (reader.Read())
+                            {
+                                land.ParcelAccessList.Add(BuildLandAccessData(reader));
+                            }
                         }
                     }
-                    finally
-                    {
-                        reader.Close();
-                    }
                 }
-                cmd.Dispose();
             }
 
             return landData;
diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs
index a6cce57..a724a50 100644
--- a/OpenSim/Data/MySQL/MySQLManager.cs
+++ b/OpenSim/Data/MySQL/MySQLManager.cs
@@ -134,18 +134,16 @@ namespace OpenSim.Data.MySQL
         /// </summary>
         protected void GetWaitTimeout()
         {
-            MySqlCommand cmd = new MySqlCommand(m_waitTimeoutSelect, dbcon);
-
-            using (MySqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow))
+            using (MySqlCommand cmd = new MySqlCommand(m_waitTimeoutSelect, dbcon))
             {
-                if (dbReader.Read())
+                using (MySqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                 {
-                    m_waitTimeout
-                        = Convert.ToInt32(dbReader["@@wait_timeout"]) * TimeSpan.TicksPerSecond + m_waitTimeoutLeeway;
+                    if (dbReader.Read())
+                    {
+                        m_waitTimeout
+                            = Convert.ToInt32(dbReader["@@wait_timeout"]) * TimeSpan.TicksPerSecond + m_waitTimeoutLeeway;
+                    }
                 }
-
-                dbReader.Close();
-                cmd.Dispose();
             }
 
             m_lastConnectionUse = DateTime.Now.Ticks;
@@ -303,31 +301,31 @@ namespace OpenSim.Data.MySQL
             {
                 CheckConnection();
 
-                MySqlCommand tablesCmd =
-                    new MySqlCommand(
-                        "SELECT TABLE_NAME, TABLE_COMMENT FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA=?dbname",
-                        dbcon);
-                tablesCmd.Parameters.AddWithValue("?dbname", dbcon.Database);
-
-                using (MySqlDataReader tables = tablesCmd.ExecuteReader())
+                using (MySqlCommand tablesCmd = new MySqlCommand(
+                    "SELECT TABLE_NAME, TABLE_COMMENT FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA=?dbname",
+                    dbcon))
                 {
-                    while (tables.Read())
+                    tablesCmd.Parameters.AddWithValue("?dbname", dbcon.Database);
+
+                    using (MySqlDataReader tables = tablesCmd.ExecuteReader())
                     {
-                        try
+                        while (tables.Read())
                         {
-                            string tableName = (string) tables["TABLE_NAME"];
-                            string comment = (string) tables["TABLE_COMMENT"];
-                            if (tableList.ContainsKey(tableName))
+                            try
                             {
-                                tableList[tableName] = comment;
+                                string tableName = (string)tables["TABLE_NAME"];
+                                string comment = (string)tables["TABLE_COMMENT"];
+                                if (tableList.ContainsKey(tableName))
+                                {
+                                    tableList[tableName] = comment;
+                                }
+                            }
+                            catch (Exception e)
+                            {
+                                m_log.Error(e.Message, e);
                             }
-                        }
-                        catch (Exception e)
-                        {
-                            m_log.Error(e.ToString());
                         }
                     }
-                    tables.Close();
                 }
             }
         }
@@ -346,19 +344,19 @@ namespace OpenSim.Data.MySQL
             {
                 CheckConnection(); // Not sure if this one is necessary
 
-                MySqlCommand dbcommand = (MySqlCommand) dbcon.CreateCommand();
+                MySqlCommand dbcommand = (MySqlCommand)dbcon.CreateCommand();
                 dbcommand.CommandText = sql;
                 foreach (KeyValuePair<string, object> param in parameters)
                 {
                     dbcommand.Parameters.AddWithValue(param.Key, param.Value);
                 }
 
-                return (IDbCommand) dbcommand;
+                return (IDbCommand)dbcommand;
             }
             catch (Exception e)
             {
                 // Return null if it fails.
-                m_log.Error("Failed during Query generation: " + e.ToString());
+                m_log.Error("Failed during Query generation: " + e.Message, e);
                 return null;
             }
         }
@@ -694,8 +692,6 @@ namespace OpenSim.Data.MySQL
                 ret.Add(attachpoint, item);
             }
 
-            r.Close();
-
             return ret;
         }
 
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs
index 06ef624..04b24b6 100644
--- a/OpenSim/Data/MySQL/MySQLRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLRegionData.cs
@@ -56,12 +56,13 @@ namespace OpenSim.Data.MySQL
             if (scopeID != UUID.Zero)
                 command += " and ScopeID = ?scopeID";
 
-            MySqlCommand cmd = new MySqlCommand(command);
-
-            cmd.Parameters.AddWithValue("?regionName", regionName);
-            cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString());
+            using (MySqlCommand cmd = new MySqlCommand(command))
+            {
+                cmd.Parameters.AddWithValue("?regionName", regionName);
+                cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString());
 
-            return RunCommand(cmd);
+                return RunCommand(cmd);
+            }
         }
 
         public RegionData Get(int posX, int posY, UUID scopeID)
@@ -70,17 +71,18 @@ namespace OpenSim.Data.MySQL
             if (scopeID != UUID.Zero)
                 command += " and ScopeID = ?scopeID";
 
-            MySqlCommand cmd = new MySqlCommand(command);
-
-            cmd.Parameters.AddWithValue("?posX", posX.ToString());
-            cmd.Parameters.AddWithValue("?posY", posY.ToString());
-            cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString());
+            using (MySqlCommand cmd = new MySqlCommand(command))
+            {
+                cmd.Parameters.AddWithValue("?posX", posX.ToString());
+                cmd.Parameters.AddWithValue("?posY", posY.ToString());
+                cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString());
 
-            List<RegionData> ret = RunCommand(cmd);
-            if (ret.Count == 0)
-                return null;
+                List<RegionData> ret = RunCommand(cmd);
+                if (ret.Count == 0)
+                    return null;
 
-            return ret[0];
+                return ret[0];
+            }
         }
 
         public RegionData Get(UUID regionID, UUID scopeID)
@@ -89,16 +91,17 @@ namespace OpenSim.Data.MySQL
             if (scopeID != UUID.Zero)
                 command += " and ScopeID = ?scopeID";
 
-            MySqlCommand cmd = new MySqlCommand(command);
-
-            cmd.Parameters.AddWithValue("?regionID", regionID.ToString());
-            cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString());
+            using (MySqlCommand cmd = new MySqlCommand(command))
+            {
+                cmd.Parameters.AddWithValue("?regionID", regionID.ToString());
+                cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString());
 
-            List<RegionData> ret = RunCommand(cmd);
-            if (ret.Count == 0)
-                return null;
+                List<RegionData> ret = RunCommand(cmd);
+                if (ret.Count == 0)
+                    return null;
 
-            return ret[0];
+                return ret[0];
+            }
         }
 
         public List<RegionData> Get(int startX, int startY, int endX, int endY, UUID scopeID)
@@ -107,71 +110,70 @@ namespace OpenSim.Data.MySQL
             if (scopeID != UUID.Zero)
                 command += " and ScopeID = ?scopeID";
 
-            MySqlCommand cmd = new MySqlCommand(command);
-
-            cmd.Parameters.AddWithValue("?startX", startX.ToString());
-            cmd.Parameters.AddWithValue("?startY", startY.ToString());
-            cmd.Parameters.AddWithValue("?endX", endX.ToString());
-            cmd.Parameters.AddWithValue("?endY", endY.ToString());
-            cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString());
+            using (MySqlCommand cmd = new MySqlCommand(command))
+            {
+                cmd.Parameters.AddWithValue("?startX", startX.ToString());
+                cmd.Parameters.AddWithValue("?startY", startY.ToString());
+                cmd.Parameters.AddWithValue("?endX", endX.ToString());
+                cmd.Parameters.AddWithValue("?endY", endY.ToString());
+                cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString());
 
-            return RunCommand(cmd);
+                return RunCommand(cmd);
+            }
         }
 
         public List<RegionData> RunCommand(MySqlCommand cmd)
         {
             List<RegionData> retList = new List<RegionData>();
 
-            IDataReader result = ExecuteReader(cmd);
-
-            while (result.Read())
+            using (IDataReader result = ExecuteReader(cmd))
             {
-                RegionData ret = new RegionData();
-                ret.Data = new Dictionary<string, object>();
-
-                UUID regionID;
-                UUID.TryParse(result["uuid"].ToString(), out regionID);
-                ret.RegionID = regionID;
-                UUID scope;
-                UUID.TryParse(result["ScopeID"].ToString(), out scope);
-                ret.ScopeID = scope;
-                ret.RegionName = result["regionName"].ToString();
-                ret.posX = Convert.ToInt32(result["locX"]);
-                ret.posY = Convert.ToInt32(result["locY"]);
-                ret.sizeX = Convert.ToInt32(result["sizeX"]);
-                ret.sizeY = Convert.ToInt32(result["sizeY"]);
-
-                if (m_ColumnNames == null)
+                while (result.Read())
                 {
-                    m_ColumnNames = new List<string>();
-
-                    DataTable schemaTable = result.GetSchemaTable();
-                    foreach (DataRow row in schemaTable.Rows)
-                        m_ColumnNames.Add(row["ColumnName"].ToString());
+                    RegionData ret = new RegionData();
+                    ret.Data = new Dictionary<string, object>();
+
+                    UUID regionID;
+                    UUID.TryParse(result["uuid"].ToString(), out regionID);
+                    ret.RegionID = regionID;
+                    UUID scope;
+                    UUID.TryParse(result["ScopeID"].ToString(), out scope);
+                    ret.ScopeID = scope;
+                    ret.RegionName = result["regionName"].ToString();
+                    ret.posX = Convert.ToInt32(result["locX"]);
+                    ret.posY = Convert.ToInt32(result["locY"]);
+                    ret.sizeX = Convert.ToInt32(result["sizeX"]);
+                    ret.sizeY = Convert.ToInt32(result["sizeY"]);
+
+                    if (m_ColumnNames == null)
+                    {
+                        m_ColumnNames = new List<string>();
+
+                        DataTable schemaTable = result.GetSchemaTable();
+                        foreach (DataRow row in schemaTable.Rows)
+                            m_ColumnNames.Add(row["ColumnName"].ToString());
+                    }
+
+                    foreach (string s in m_ColumnNames)
+                    {
+                        if (s == "uuid")
+                            continue;
+                        if (s == "ScopeID")
+                            continue;
+                        if (s == "regionName")
+                            continue;
+                        if (s == "locX")
+                            continue;
+                        if (s == "locY")
+                            continue;
+
+                        ret.Data[s] = result[s].ToString();
+                    }
+
+                    retList.Add(ret);
                 }
-
-                foreach (string s in m_ColumnNames)
-                {
-                    if (s == "uuid")
-                        continue;
-                    if (s == "ScopeID")
-                        continue;
-                    if (s == "regionName")
-                        continue;
-                    if (s == "locX")
-                        continue;
-                    if (s == "locY")
-                        continue;
-
-                    ret.Data[s] = result[s].ToString();
-                }
-
-                retList.Add(ret);
             }
 
-            result.Close();
-            CloseReaderCommand(cmd);
-
             return retList;
         }
 
@@ -198,76 +200,72 @@ namespace OpenSim.Data.MySQL
 
             string[] fields = new List<string>(data.Data.Keys).ToArray();
 
-            MySqlCommand cmd = new MySqlCommand();
-
-            string update = "update `"+m_Realm+"` set locX=?posX, locY=?posY, sizeX=?sizeX, sizeY=?sizeY";
-            foreach (string field in fields)
+            using (MySqlCommand cmd = new MySqlCommand())
             {
-                update += ", ";
-                update += "`" + field + "` = ?"+field;
-
-                cmd.Parameters.AddWithValue("?"+field, data.Data[field]);
-            }
-
-            update += " where uuid = ?regionID";
+                string update = "update `" + m_Realm + "` set locX=?posX, locY=?posY, sizeX=?sizeX, sizeY=?sizeY";
+                foreach (string field in fields)
+                {
+                    update += ", ";
+                    update += "`" + field + "` = ?" + field;
 
-            if (data.ScopeID != UUID.Zero)
-                update += " and ScopeID = ?scopeID";
+                    cmd.Parameters.AddWithValue("?" + field, data.Data[field]);
+                }
 
-            cmd.CommandText = update;
-            cmd.Parameters.AddWithValue("?regionID", data.RegionID.ToString());
-            cmd.Parameters.AddWithValue("?regionName", data.RegionName);
-            cmd.Parameters.AddWithValue("?scopeID", data.ScopeID.ToString());
-            cmd.Parameters.AddWithValue("?posX", data.posX.ToString());
-            cmd.Parameters.AddWithValue("?posY", data.posY.ToString());
-            cmd.Parameters.AddWithValue("?sizeX", data.sizeX.ToString());
-            cmd.Parameters.AddWithValue("?sizeY", data.sizeY.ToString());
+                update += " where uuid = ?regionID";
 
-            if (ExecuteNonQuery(cmd) < 1)
-            {
-                string insert = "insert into `" + m_Realm + "` (`uuid`, `ScopeID`, `locX`, `locY`, `sizeX`, `sizeY`, `regionName`, `" +
-                        String.Join("`, `", fields) +
-                        "`) values ( ?regionID, ?scopeID, ?posX, ?posY, ?sizeX, ?sizeY, ?regionName, ?" + String.Join(", ?", fields) + ")";
+                if (data.ScopeID != UUID.Zero)
+                    update += " and ScopeID = ?scopeID";
 
-                cmd.CommandText = insert;
+                cmd.CommandText = update;
+                cmd.Parameters.AddWithValue("?regionID", data.RegionID.ToString());
+                cmd.Parameters.AddWithValue("?regionName", data.RegionName);
+                cmd.Parameters.AddWithValue("?scopeID", data.ScopeID.ToString());
+                cmd.Parameters.AddWithValue("?posX", data.posX.ToString());
+                cmd.Parameters.AddWithValue("?posY", data.posY.ToString());
+                cmd.Parameters.AddWithValue("?sizeX", data.sizeX.ToString());
+                cmd.Parameters.AddWithValue("?sizeY", data.sizeY.ToString());
 
                 if (ExecuteNonQuery(cmd) < 1)
                 {
-                    cmd.Dispose();
-                    return false;
+                    string insert = "insert into `" + m_Realm + "` (`uuid`, `ScopeID`, `locX`, `locY`, `sizeX`, `sizeY`, `regionName`, `" +
+                            String.Join("`, `", fields) +
+                            "`) values ( ?regionID, ?scopeID, ?posX, ?posY, ?sizeX, ?sizeY, ?regionName, ?" + String.Join(", ?", fields) + ")";
+
+                    cmd.CommandText = insert;
+
+                    if (ExecuteNonQuery(cmd) < 1)
+                    {
+                        return false;
+                    }
                 }
             }
 
-            cmd.Dispose();
-
             return true;
         }
 
         public bool SetDataItem(UUID regionID, string item, string value)
         {
-            MySqlCommand cmd = new MySqlCommand("update `" + m_Realm +
-                    "` set `" + item + "` = ?" + item + " where uuid = ?UUID");
-
-
-            cmd.Parameters.AddWithValue("?"+item, value);
-            cmd.Parameters.AddWithValue("?UUID", regionID.ToString());
+            using (MySqlCommand cmd = new MySqlCommand("update `" + m_Realm + "` set `" + item + "` = ?" + item + " where uuid = ?UUID"))
+            {
+                cmd.Parameters.AddWithValue("?" + item, value);
+                cmd.Parameters.AddWithValue("?UUID", regionID.ToString());
 
-            if (ExecuteNonQuery(cmd) > 0)
-                return true;
+                if (ExecuteNonQuery(cmd) > 0)
+                    return true;
+            }
 
             return false;
         }
 
         public bool Delete(UUID regionID)
         {
-            MySqlCommand cmd = new MySqlCommand("delete from `" + m_Realm +
-                    "` where uuid = ?UUID");
-
-
-            cmd.Parameters.AddWithValue("?UUID", regionID.ToString());
+            using (MySqlCommand cmd = new MySqlCommand("delete from `" + m_Realm + "` where uuid = ?UUID"))
+            {
+                cmd.Parameters.AddWithValue("?UUID", regionID.ToString());
 
-            if (ExecuteNonQuery(cmd) > 0)
-                return true;
+                if (ExecuteNonQuery(cmd) > 0)
+                    return true;
+            }
 
             return false;
         }
diff --git a/OpenSim/Data/MySQL/MySQLUserAccountData.cs b/OpenSim/Data/MySQL/MySQLUserAccountData.cs
index d48144d..c713a11 100644
--- a/OpenSim/Data/MySQL/MySQLUserAccountData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserAccountData.cs
@@ -64,48 +64,44 @@ namespace OpenSim.Data.MySQL
             if (scopeID != UUID.Zero)
                 command += " and ScopeID = ?scopeID";
 
-            MySqlCommand cmd = new MySqlCommand(command);
-
-            cmd.Parameters.AddWithValue("?principalID", principalID.ToString());
-            cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString());
-
-            IDataReader result = ExecuteReader(cmd);
-
-            if (result.Read())
+            using (MySqlCommand cmd = new MySqlCommand(command))
             {
-                ret.PrincipalID = principalID;
-                UUID scope;
-                UUID.TryParse(result["ScopeID"].ToString(), out scope);
-                ret.ScopeID = scope;
+                cmd.Parameters.AddWithValue("?principalID", principalID.ToString());
+                cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString());
 
-                if (m_ColumnNames == null)
+                using (IDataReader result = ExecuteReader(cmd))
                 {
-                    m_ColumnNames = new List<string>();
-
-                    DataTable schemaTable = result.GetSchemaTable();
-                    foreach (DataRow row in schemaTable.Rows)
-                        m_ColumnNames.Add(row["ColumnName"].ToString());
+                    if (result.Read())
+                    {
+                        ret.PrincipalID = principalID;
+                        UUID scope;
+                        UUID.TryParse(result["ScopeID"].ToString(), out scope);
+                        ret.ScopeID = scope;
+
+                        if (m_ColumnNames == null)
+                        {
+                            m_ColumnNames = new List<string>();
+
+                            DataTable schemaTable = result.GetSchemaTable();
+                            foreach (DataRow row in schemaTable.Rows)
+                                m_ColumnNames.Add(row["ColumnName"].ToString());
+                        }
+
+                        foreach (string s in m_ColumnNames)
+                        {
+                            if (s == "UUID")
+                                continue;
+                            if (s == "ScopeID")
+                                continue;
+
+                            ret.Data[s] = result[s].ToString();
+                        }
+
+                        return ret;
+                    }
                 }
-
-                foreach (string s in m_ColumnNames)
-                {
-                    if (s == "UUID")
-                        continue;
-                    if (s == "ScopeID")
-                        continue;
-
-                    ret.Data[s] = result[s].ToString();
-                }
-
-                result.Close();
-                CloseReaderCommand(cmd);
-
-                return ret;
             }
 
-            result.Close();
-            CloseReaderCommand(cmd);
-
             return null;
         }
 
@@ -118,61 +114,60 @@ namespace OpenSim.Data.MySQL
 
             string[] fields = new List<string>(data.Data.Keys).ToArray();
 
-            MySqlCommand cmd = new MySqlCommand();
-
-            string update = "update `"+m_Realm+"` set ";
-            bool first = true;
-            foreach (string field in fields)
+            using (MySqlCommand cmd = new MySqlCommand())
             {
-                if (!first)
-                    update += ", ";
-                update += "`" + field + "` = ?"+field;
-
-                first = false;
-
-                cmd.Parameters.AddWithValue("?"+field, data.Data[field]);
-            }
+                string update = "update `" + m_Realm + "` set ";
+                bool first = true;
+                foreach (string field in fields)
+                {
+                    if (!first)
+                        update += ", ";
+                    update += "`" + field + "` = ?" + field;
 
-            update += " where UUID = ?principalID";
+                    first = false;
 
-            if (data.ScopeID != UUID.Zero)
-                update += " and ScopeID = ?scopeID";
+                    cmd.Parameters.AddWithValue("?" + field, data.Data[field]);
+                }
 
-            cmd.CommandText = update;
-            cmd.Parameters.AddWithValue("?principalID", data.PrincipalID.ToString());
-            cmd.Parameters.AddWithValue("?scopeID", data.ScopeID.ToString());
+                update += " where UUID = ?principalID";
 
-            if (ExecuteNonQuery(cmd) < 1)
-            {
-                string insert = "insert into `" + m_Realm + "` (`UUID`, `ScopeID`, `" +
-                        String.Join("`, `", fields) +
-                        "`) values (?principalID, ?scopeID, ?" + String.Join(", ?", fields) + ")";
+                if (data.ScopeID != UUID.Zero)
+                    update += " and ScopeID = ?scopeID";
 
-                cmd.CommandText = insert;
+                cmd.CommandText = update;
+                cmd.Parameters.AddWithValue("?principalID", data.PrincipalID.ToString());
+                cmd.Parameters.AddWithValue("?scopeID", data.ScopeID.ToString());
 
                 if (ExecuteNonQuery(cmd) < 1)
                 {
-                    cmd.Dispose();
-                    return false;
+                    string insert = "insert into `" + m_Realm + "` (`UUID`, `ScopeID`, `" +
+                            String.Join("`, `", fields) +
+                            "`) values (?principalID, ?scopeID, ?" + String.Join(", ?", fields) + ")";
+
+                    cmd.CommandText = insert;
+
+                    if (ExecuteNonQuery(cmd) < 1)
+                    {
+                        cmd.Dispose();
+                        return false;
+                    }
                 }
             }
 
-            cmd.Dispose();
-
             return true;
         }
 
         public bool SetDataItem(UUID principalID, string item, string value)
         {
-            MySqlCommand cmd = new MySqlCommand("update `" + m_Realm +
-                    "` set `" + item + "` = ?" + item + " where UUID = ?UUID");
-
-
-            cmd.Parameters.AddWithValue("?"+item, value);
-            cmd.Parameters.AddWithValue("?UUID", principalID.ToString());
+            using (MySqlCommand cmd = new MySqlCommand("update `" + m_Realm + "` set `" +
+                item + "` = ?" + item + " where UUID = ?UUID"))
+            {
+                cmd.Parameters.AddWithValue("?" + item, value);
+                cmd.Parameters.AddWithValue("?UUID", principalID.ToString());
 
-            if (ExecuteNonQuery(cmd) > 0)
-                return true;
+                if (ExecuteNonQuery(cmd) > 0)
+                    return true;
+            }
 
             return false;
         }
diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs
index 04f872f..bd46dfc 100644
--- a/OpenSim/Data/MySQL/MySQLUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserData.cs
@@ -181,21 +181,20 @@ namespace OpenSim.Data.MySQL
                 param["?first"] = user;
                 param["?second"] = last;
 
-                IDbCommand result =
-                    dbm.Manager.Query(
-                        "SELECT * FROM " + m_usersTableName + " WHERE username = ?first AND lastname = ?second", param);
-                IDataReader reader = result.ExecuteReader();
-
-                UserProfileData row = dbm.Manager.readUserRow(reader);
-
-                reader.Dispose();
-                result.Dispose();
-                return row;
+                using (IDbCommand result = dbm.Manager.Query(
+                    "SELECT * FROM " + m_usersTableName + " WHERE username = ?first AND lastname = ?second", param))
+                {
+                    using (IDataReader reader = result.ExecuteReader())
+                    {
+                        UserProfileData row = dbm.Manager.readUserRow(reader);
+                        return row;
+                    }
+                }
             }
             catch (Exception e)
             {
                 dbm.Manager.Reconnect();
-                m_log.Error(e.ToString());
+                m_log.Error(e.Message, e);
                 return null;
             }
             finally
@@ -220,28 +219,30 @@ namespace OpenSim.Data.MySQL
 
             try
             {
-                IDbCommand adder =
-                    dbm.Manager.Query(
-                        "INSERT INTO `" + m_userFriendsTableName + "` " +
-                        "(`ownerID`,`friendID`,`friendPerms`,`datetimestamp`) " +
-                        "VALUES " +
-                        "(?ownerID,?friendID,?friendPerms,?datetimestamp)",
-                        param);
-                adder.ExecuteNonQuery();
-
-                adder =
-                    dbm.Manager.Query(
-                        "INSERT INTO `" + m_userFriendsTableName + "` " +
-                        "(`ownerID`,`friendID`,`friendPerms`,`datetimestamp`) " +
-                        "VALUES " +
-                        "(?friendID,?ownerID,?friendPerms,?datetimestamp)",
-                        param);
-                adder.ExecuteNonQuery();
+                using (IDbCommand adder = dbm.Manager.Query(
+                    "INSERT INTO `" + m_userFriendsTableName + "` " +
+                    "(`ownerID`,`friendID`,`friendPerms`,`datetimestamp`) " +
+                    "VALUES " +
+                    "(?ownerID,?friendID,?friendPerms,?datetimestamp)",
+                    param))
+                {
+                    adder.ExecuteNonQuery();
+                }
+
+                using (IDbCommand adder = dbm.Manager.Query(
+                    "INSERT INTO `" + m_userFriendsTableName + "` " +
+                    "(`ownerID`,`friendID`,`friendPerms`,`datetimestamp`) " +
+                    "VALUES " +
+                    "(?friendID,?ownerID,?friendPerms,?datetimestamp)",
+                    param))
+                {
+                    adder.ExecuteNonQuery();
+                }
             }
             catch (Exception e)
             {
                 dbm.Manager.Reconnect();
-                m_log.Error(e.ToString());
+                m_log.Error(e.Message, e);
                 return;
             }
             finally
@@ -260,22 +261,24 @@ namespace OpenSim.Data.MySQL
 
             try
             {
-                IDbCommand updater =
-                    dbm.Manager.Query(
+                using (IDbCommand updater = dbm.Manager.Query(
                         "delete from " + m_userFriendsTableName + " where ownerID = ?ownerID and friendID = ?friendID",
-                        param);
-                updater.ExecuteNonQuery();
+                        param))
+                {
+                    updater.ExecuteNonQuery();
+                }
 
-                updater =
-                    dbm.Manager.Query(
+                using (IDbCommand updater = dbm.Manager.Query(
                         "delete from " + m_userFriendsTableName + " where ownerID = ?friendID and friendID = ?ownerID",
-                        param);
-                updater.ExecuteNonQuery();
+                        param))
+                {
+                    updater.ExecuteNonQuery();
+                }
             }
             catch (Exception e)
             {
                 dbm.Manager.Reconnect();
-                m_log.Error(e.ToString());
+                m_log.Error(e.Message, e);
                 return;
             }
             finally
@@ -295,18 +298,19 @@ namespace OpenSim.Data.MySQL
 
             try
             {
-                IDbCommand updater =
-                    dbm.Manager.Query(
+                using (IDbCommand updater = dbm.Manager.Query(
                         "update " + m_userFriendsTableName +
                         " SET friendPerms = ?friendPerms " +
                         "where ownerID = ?ownerID and friendID = ?friendID",
-                        param);
-                updater.ExecuteNonQuery();
+                        param))
+                {
+                    updater.ExecuteNonQuery();
+                }
             }
             catch (Exception e)
             {
                 dbm.Manager.Reconnect();
-                m_log.Error(e.ToString());
+                m_log.Error(e.Message, e);
                 return;
             }
             finally
@@ -327,34 +331,33 @@ namespace OpenSim.Data.MySQL
             try
             {
                 //Left Join userfriends to itself
-                IDbCommand result =
-                    dbm.Manager.Query(
-                        "select a.ownerID,a.friendID,a.friendPerms,b.friendPerms as ownerperms from " +
-                        m_userFriendsTableName + " as a, " + m_userFriendsTableName + " as b" +
-                        " where a.ownerID = ?ownerID and b.ownerID = a.friendID and b.friendID = a.ownerID",
-                        param);
-                IDataReader reader = result.ExecuteReader();
-
-                while (reader.Read())
+                using (IDbCommand result = dbm.Manager.Query(
+                    "select a.ownerID,a.friendID,a.friendPerms,b.friendPerms as ownerperms from " +
+                    m_userFriendsTableName + " as a, " + m_userFriendsTableName + " as b" +
+                    " where a.ownerID = ?ownerID and b.ownerID = a.friendID and b.friendID = a.ownerID",
+                    param))
                 {
-                    FriendListItem fli = new FriendListItem();
-                    fli.FriendListOwner = new UUID((string) reader["ownerID"]);
-                    fli.Friend = new UUID((string) reader["friendID"]);
-                    fli.FriendPerms = (uint) Convert.ToInt32(reader["friendPerms"]);
-
-                    // This is not a real column in the database table, it's a joined column from the opposite record
-                    fli.FriendListOwnerPerms = (uint) Convert.ToInt32(reader["ownerperms"]);
-
-                    Lfli.Add(fli);
+                    using (IDataReader reader = result.ExecuteReader())
+                    {
+                        while (reader.Read())
+                        {
+                            FriendListItem fli = new FriendListItem();
+                            fli.FriendListOwner = new UUID((string)reader["ownerID"]);
+                            fli.Friend = new UUID((string)reader["friendID"]);
+                            fli.FriendPerms = (uint)Convert.ToInt32(reader["friendPerms"]);
+
+                            // This is not a real column in the database table, it's a joined column from the opposite record
+                            fli.FriendListOwnerPerms = (uint)Convert.ToInt32(reader["ownerperms"]);
+
+                            Lfli.Add(fli);
+                        }
+                    }
                 }
-
-                reader.Dispose();
-                result.Dispose();
             }
             catch (Exception e)
             {
                 dbm.Manager.Reconnect();
-                m_log.Error(e.ToString());
+                m_log.Error(e.Message, e);
                 return Lfli;
             }
             finally
@@ -376,29 +379,29 @@ namespace OpenSim.Data.MySQL
                 {
                     Dictionary<string, object> param = new Dictionary<string, object>();
                     param["?uuid"] = uuid.ToString();
-                    IDbCommand result =
-                        dbm.Manager.Query("select agentOnline,currentHandle from " + m_agentsTableName +
-                                          " where UUID = ?uuid", param);
 
-                    IDataReader reader = result.ExecuteReader();
-                    while (reader.Read())
+                    using (IDbCommand result = dbm.Manager.Query("select agentOnline,currentHandle from " + m_agentsTableName +
+                                          " where UUID = ?uuid", param))
                     {
-                        FriendRegionInfo fri = new FriendRegionInfo();
-                        fri.isOnline = (sbyte)reader["agentOnline"] != 0;
-                        fri.regionHandle = (ulong)reader["currentHandle"];
-
-                        infos[uuid] = fri;
+                        using (IDataReader reader = result.ExecuteReader())
+                        {
+                            while (reader.Read())
+                            {
+                                FriendRegionInfo fri = new FriendRegionInfo();
+                                fri.isOnline = (sbyte)reader["agentOnline"] != 0;
+                                fri.regionHandle = (ulong)reader["currentHandle"];
+
+                                infos[uuid] = fri;
+                            }
+                        }
                     }
-
-                    reader.Dispose();
-                    result.Dispose();
                 }
             }
             catch (Exception e)
             {
                 m_log.Warn("[MYSQL]: Got exception on trying to find friends regions:", e);
                 dbm.Manager.Reconnect();
-                m_log.Error(e.ToString());
+                m_log.Error(e.Message, e);
             }
             finally
             {
@@ -427,28 +430,28 @@ namespace OpenSim.Data.MySQL
 
                 try
                 {
-                    IDbCommand result =
-                        dbm.Manager.Query(
-                            "SELECT UUID,username,lastname FROM " + m_usersTableName +
-                            " WHERE username like ?first AND lastname like ?second LIMIT 100",
-                            param);
-                    IDataReader reader = result.ExecuteReader();
-
-                    while (reader.Read())
+                    using (IDbCommand result = dbm.Manager.Query(
+                        "SELECT UUID,username,lastname FROM " + m_usersTableName +
+                        " WHERE username like ?first AND lastname like ?second LIMIT 100",
+                        param))
                     {
-                        AvatarPickerAvatar user = new AvatarPickerAvatar();
-                        user.AvatarID = new UUID((string) reader["UUID"]);
-                        user.firstName = (string) reader["username"];
-                        user.lastName = (string) reader["lastname"];
-                        returnlist.Add(user);
+                        using (IDataReader reader = result.ExecuteReader())
+                        {
+                            while (reader.Read())
+                            {
+                                AvatarPickerAvatar user = new AvatarPickerAvatar();
+                                user.AvatarID = new UUID((string)reader["UUID"]);
+                                user.firstName = (string)reader["username"];
+                                user.lastName = (string)reader["lastname"];
+                                returnlist.Add(user);
+                            }
+                        }
                     }
-                    reader.Dispose();
-                    result.Dispose();
                 }
                 catch (Exception e)
                 {
                     dbm.Manager.Reconnect();
-                    m_log.Error(e.ToString());
+                    m_log.Error(e.Message, e);
                     return returnlist;
                 }
                 finally
@@ -465,28 +468,28 @@ namespace OpenSim.Data.MySQL
                     Dictionary<string, object> param = new Dictionary<string, object>();
                     param["?first"] = objAlphaNumericPattern.Replace(querysplit[0], String.Empty) + "%";
 
-                    IDbCommand result =
-                        dbm.Manager.Query(
-                            "SELECT UUID,username,lastname FROM " + m_usersTableName +
-                            " WHERE username like ?first OR lastname like ?first LIMIT 100",
-                            param);
-                    IDataReader reader = result.ExecuteReader();
-
-                    while (reader.Read())
+                    using (IDbCommand result = dbm.Manager.Query(
+                        "SELECT UUID,username,lastname FROM " + m_usersTableName +
+                        " WHERE username like ?first OR lastname like ?first LIMIT 100",
+                        param))
                     {
-                        AvatarPickerAvatar user = new AvatarPickerAvatar();
-                        user.AvatarID = new UUID((string) reader["UUID"]);
-                        user.firstName = (string) reader["username"];
-                        user.lastName = (string) reader["lastname"];
-                        returnlist.Add(user);
+                        using (IDataReader reader = result.ExecuteReader())
+                        {
+                            while (reader.Read())
+                            {
+                                AvatarPickerAvatar user = new AvatarPickerAvatar();
+                                user.AvatarID = new UUID((string)reader["UUID"]);
+                                user.firstName = (string)reader["username"];
+                                user.lastName = (string)reader["lastname"];
+                                returnlist.Add(user);
+                            }
+                        }
                     }
-                    reader.Dispose();
-                    result.Dispose();
                 }
                 catch (Exception e)
                 {
                     dbm.Manager.Reconnect();
-                    m_log.Error(e.ToString());
+                    m_log.Error(e.Message, e);
                     return returnlist;
                 }
                 finally
@@ -510,20 +513,19 @@ namespace OpenSim.Data.MySQL
                 Dictionary<string, object> param = new Dictionary<string, object>();
                 param["?uuid"] = uuid.ToString();
 
-                IDbCommand result = dbm.Manager.Query("SELECT * FROM " + m_usersTableName + " WHERE UUID = ?uuid", param);
-                IDataReader reader = result.ExecuteReader();
-
-                UserProfileData row = dbm.Manager.readUserRow(reader);
-
-                reader.Dispose();
-                result.Dispose();
-
-                return row;
+                using (IDbCommand result = dbm.Manager.Query("SELECT * FROM " + m_usersTableName + " WHERE UUID = ?uuid", param))
+                {
+                    using (IDataReader reader = result.ExecuteReader())
+                    {
+                        UserProfileData row = dbm.Manager.readUserRow(reader);
+                        return row;
+                    }
+                }
             }
             catch (Exception e)
             {
                 dbm.Manager.Reconnect();
-                m_log.Error(e.ToString());
+                m_log.Error(e.Message, e);
                 return null;
             }
             finally
@@ -569,15 +571,15 @@ namespace OpenSim.Data.MySQL
 
             try
             {
-               dbm.Manager.ExecuteParameterizedSql(
-                        "update " + m_usersTableName + " SET webLoginKey = ?webLoginKey " +
-                        "where UUID = ?UUID",
-                        param);
+                dbm.Manager.ExecuteParameterizedSql(
+                    "update " + m_usersTableName + " SET webLoginKey = ?webLoginKey " +
+                    "where UUID = ?UUID",
+                    param);
             }
             catch (Exception e)
             {
                 dbm.Manager.Reconnect();
-                m_log.Error(e.ToString());
+                m_log.Error(e.Message, e);
                 return;
             }
             finally
@@ -600,21 +602,19 @@ namespace OpenSim.Data.MySQL
                 Dictionary<string, object> param = new Dictionary<string, object>();
                 param["?uuid"] = uuid.ToString();
 
-                IDbCommand result = dbm.Manager.Query("SELECT * FROM " + m_agentsTableName + " WHERE UUID = ?uuid",
-                                                      param);
-                IDataReader reader = result.ExecuteReader();
-
-                UserAgentData row = dbm.Manager.readAgentRow(reader);
-
-                reader.Dispose();
-                result.Dispose();
-
-                return row;
+                using (IDbCommand result = dbm.Manager.Query("SELECT * FROM " + m_agentsTableName + " WHERE UUID = ?uuid", param))
+                {
+                    using (IDataReader reader = result.ExecuteReader())
+                    {
+                        UserAgentData row = dbm.Manager.readAgentRow(reader);
+                        return row;
+                    }
+                }
             }
             catch (Exception e)
             {
                 dbm.Manager.Reconnect();
-                m_log.Error(e.ToString());
+                m_log.Error(e.Message, e);
                 return null;
             }
             finally
@@ -638,19 +638,20 @@ namespace OpenSim.Data.MySQL
 
             try
             {
-                dbm.Manager.insertUserRow(user.ID, user.FirstName, user.SurName, user.Email, user.PasswordHash, user.PasswordSalt,
-                                          user.HomeRegion, user.HomeRegionID, user.HomeLocation.X, user.HomeLocation.Y,
-                                          user.HomeLocation.Z,
-                                          user.HomeLookAt.X, user.HomeLookAt.Y, user.HomeLookAt.Z, user.Created,
-                                          user.LastLogin, user.UserInventoryURI, user.UserAssetURI,
-                                          user.CanDoMask, user.WantDoMask,
-                                          user.AboutText, user.FirstLifeAboutText, user.Image,
-                                          user.FirstLifeImage, user.WebLoginKey, user.UserFlags, user.GodLevel, user.CustomType, user.Partner);
+                dbm.Manager.insertUserRow(
+                    user.ID, user.FirstName, user.SurName, user.Email, user.PasswordHash, user.PasswordSalt,
+                    user.HomeRegion, user.HomeRegionID, user.HomeLocation.X, user.HomeLocation.Y,
+                    user.HomeLocation.Z,
+                    user.HomeLookAt.X, user.HomeLookAt.Y, user.HomeLookAt.Z, user.Created,
+                    user.LastLogin, user.UserInventoryURI, user.UserAssetURI,
+                    user.CanDoMask, user.WantDoMask,
+                    user.AboutText, user.FirstLifeAboutText, user.Image,
+                    user.FirstLifeImage, user.WebLoginKey, user.UserFlags, user.GodLevel, user.CustomType, user.Partner);
             }
             catch (Exception e)
             {
                 dbm.Manager.Reconnect();
-                m_log.Error(e.ToString());
+                m_log.Error(e.Message, e);
             }
             finally
             {
@@ -676,7 +677,7 @@ namespace OpenSim.Data.MySQL
             catch (Exception e)
             {
                 dbm.Manager.Reconnect();
-                m_log.Error(e.ToString());
+                m_log.Error(e.Message, e);
             }
             finally
             {
@@ -693,14 +694,15 @@ namespace OpenSim.Data.MySQL
             MySQLSuperManager dbm = GetLockedConnection("UpdateUserProfile");
             try
             {
-                dbm.Manager.updateUserRow(user.ID, user.FirstName, user.SurName, user.Email, user.PasswordHash, user.PasswordSalt,
-                                          user.HomeRegion, user.HomeRegionID, user.HomeLocation.X, user.HomeLocation.Y,
-                                          user.HomeLocation.Z, user.HomeLookAt.X,
-                                          user.HomeLookAt.Y, user.HomeLookAt.Z, user.Created, user.LastLogin,
-                                          user.UserInventoryURI,
-                                          user.UserAssetURI, user.CanDoMask, user.WantDoMask, user.AboutText,
-                                          user.FirstLifeAboutText, user.Image, user.FirstLifeImage, user.WebLoginKey,
-                                          user.UserFlags, user.GodLevel, user.CustomType, user.Partner);
+                dbm.Manager.updateUserRow(
+                    user.ID, user.FirstName, user.SurName, user.Email, user.PasswordHash, user.PasswordSalt,
+                    user.HomeRegion, user.HomeRegionID, user.HomeLocation.X, user.HomeLocation.Y,
+                    user.HomeLocation.Z, user.HomeLookAt.X,
+                    user.HomeLookAt.Y, user.HomeLookAt.Z, user.Created, user.LastLogin,
+                    user.UserInventoryURI,
+                    user.UserAssetURI, user.CanDoMask, user.WantDoMask, user.AboutText,
+                    user.FirstLifeAboutText, user.Image, user.FirstLifeImage, user.WebLoginKey,
+                    user.UserFlags, user.GodLevel, user.CustomType, user.Partner);
             }
             finally
             {
@@ -748,29 +750,29 @@ namespace OpenSim.Data.MySQL
                 Dictionary<string, object> param = new Dictionary<string, object>();
                 param["?owner"] = user.ToString();
 
-                IDbCommand result = dbm.Manager.Query(
-                    "SELECT * FROM " + m_appearanceTableName + " WHERE owner = ?owner", param);
-                IDataReader reader = result.ExecuteReader();
-
-                AvatarAppearance appearance = dbm.Manager.readAppearanceRow(reader);
-
-                reader.Dispose();
-                result.Dispose();
-
-                if (null == appearance)
+                using (IDbCommand result = dbm.Manager.Query("SELECT * FROM " + m_appearanceTableName + " WHERE owner = ?owner", param))
                 {
-                    m_log.WarnFormat("[USER DB] No appearance found for user {0}", user.ToString());
-                    return null;
+                    using (IDataReader reader = result.ExecuteReader())
+                    {
+                        AvatarAppearance appearance = dbm.Manager.readAppearanceRow(reader);
+
+                        if (appearance == null)
+                        {
+                            m_log.WarnFormat("[USER DB] No appearance found for user {0}", user.ToString());
+                            return null;
+                        }
+                        else
+                        {
+                            appearance.SetAttachments(GetUserAttachments(user));
+                            return appearance;
+                        }
+                    }
                 }
-                
-                appearance.SetAttachments(GetUserAttachments(user));
-
-                return appearance;
             }
             catch (Exception e)
             {
                 dbm.Manager.Reconnect();
-                m_log.Error(e.ToString());
+                m_log.Error(e.Message, e);
                 return null;
             }
             finally
@@ -798,7 +800,7 @@ namespace OpenSim.Data.MySQL
             catch (Exception e)
             {
                 dbm.Manager.Reconnect();
-                m_log.Error(e.ToString());
+                m_log.Error(e.Message, e);
             }
             finally
             {
@@ -833,20 +835,20 @@ namespace OpenSim.Data.MySQL
 
             try
             {
-                IDbCommand result = dbm.Manager.Query(
-                    "SELECT attachpoint, item, asset from " + m_attachmentsTableName + " WHERE UUID = ?uuid", param);
-                IDataReader reader = result.ExecuteReader();
-
-                Hashtable ret = dbm.Manager.readAttachments(reader);
-
-                reader.Dispose();
-                result.Dispose();
-                return ret;
+                using (IDbCommand result = dbm.Manager.Query(
+                    "SELECT attachpoint, item, asset from " + m_attachmentsTableName + " WHERE UUID = ?uuid", param))
+                {
+                    using (IDataReader reader = result.ExecuteReader())
+                    {
+                        Hashtable ret = dbm.Manager.readAttachments(reader);
+                        return ret;
+                    }
+                }
             }
             catch (Exception e)
             {
                 dbm.Manager.Reconnect();
-                m_log.Error(e.ToString());
+                m_log.Error(e.Message, e);
                 return null;
             }
             finally
@@ -905,7 +907,7 @@ namespace OpenSim.Data.MySQL
             catch (Exception e)
             {
                 dbm.Manager.Reconnect();
-                m_log.Error(e.ToString());
+                m_log.Error(e.Message, e);
                 return;
             }
             finally
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index 241af53..33b01e5 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -205,13 +205,10 @@ namespace OpenSim
                         Directory.CreateDirectory(m_crashDir);
                     }
                     string log = Util.GetUniqueFilename(ex.GetType() + ".txt");
-                    StreamWriter m_crashLog =
-                        new StreamWriter(
-                            Path.Combine(m_crashDir, log)
-                            );
-
-                    m_crashLog.WriteLine(msg);
-                    m_crashLog.Close();
+                    using (StreamWriter m_crashLog = new StreamWriter(Path.Combine(m_crashDir, log)))
+                    {
+                        m_crashLog.WriteLine(msg);
+                    }
 
                     File.Copy("OpenSim.ini", Path.Combine(m_crashDir, log + "_OpenSim.ini"), true);
                 }