Merge branch 'master' into vehicles

1 files changed, 27 insertions, 25 deletions

diff --git a/OpenSim/Data/MySQL/MySQLAuthenticationData.cs b/OpenSim/Data/MySQL/MySQLAuthenticationData.cs
index e96a123..0780936 100644
--- a/OpenSim/Data/MySQL/MySQLAuthenticationData.cs
+++ b/OpenSim/Data/MySQL/MySQLAuthenticationData.cs
@@ -55,39 +55,41 @@ namespace OpenSim.Data.MySQL
             AuthenticationData ret = new AuthenticationData();
             ret.Data = new Dictionary<string, object>();
 
-            using (MySqlCommand cmd = new MySqlCommand("select * from `" + m_Realm + "` where UUID = ?principalID"))
-            {
-                cmd.Parameters.AddWithValue("?principalID", principalID.ToString());
+            MySqlCommand cmd = new MySqlCommand("select * from `" + m_Realm + "` where UUID = ?principalID");
 
-                using (IDataReader result = ExecuteReader(cmd))
-                {
-                    if (result.Read())
-                    {
-                        ret.PrincipalID = principalID;
+            cmd.Parameters.AddWithValue("?principalID", principalID.ToString());
 
-                        if (m_ColumnNames == null)
-                        {
-                            m_ColumnNames = new List<string>();
+            IDataReader result = ExecuteReader(cmd);
 
-                            DataTable schemaTable = result.GetSchemaTable();
-                            foreach (DataRow row in schemaTable.Rows)
-                                m_ColumnNames.Add(row["ColumnName"].ToString());
-                        }
+            if (result.Read())
+            {
+                ret.PrincipalID = principalID;
+
+                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;
 
-                        return ret;
-                    }
+                    ret.Data[s] = result[s].ToString();
                 }
-            }
 
-            return null;
+                CloseDBConnection(result, cmd);
+                return ret;
+            }
+            else
+            {
+                CloseDBConnection(result, cmd);
+                return null;
+            }
         }
 
         public bool Store(AuthenticationData data)