3 files changed, 15 insertions, 31 deletions

diff --git a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
index 9bd3c0c..1564140 100644
--- a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
+++ b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
@@ -29,11 +29,9 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Reflection;
-using log4net;
+using System.Text;
 using MySql.Data.MySqlClient;
 using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
 
 namespace OpenSim.Data.MySQL
 {
@@ -129,25 +127,27 @@ namespace OpenSim.Data.MySQL
 
         public virtual T[] Get(string[] fields, string[] keys, string options)
         {
-            if (fields.Length != keys.Length)
+            int flen = fields.Length;
+            if (flen == 0 || flen != keys.Length)
                 return new T[0];
 
-            List<string> terms = new List<string>();
+            int flast = flen - 1;
+            StringBuilder sb = new StringBuilder(1024);
+            sb.AppendFormat("select * from {0} where ", m_Realm);
 
             using (MySqlCommand cmd = new MySqlCommand())
             {
-                for (int i = 0 ; i < fields.Length ; i++)
+                for (int i = 0 ; i < flen ; i++)
                 {
                     cmd.Parameters.AddWithValue(fields[i], keys[i]);
-                    terms.Add("`" + fields[i] + "` = ?" + fields[i]);
+                    if(i< flast)
+                        sb.AppendFormat("`{0}` = ?{0} and ", fields[i]);
+                    else
+                        sb.AppendFormat("`{0}` = ?{0} ", fields[i]);
                 }
 
-                string where = String.Join(" and ", terms.ToArray());
-
-                string query = String.Format("select * from {0} where {1} {2}",
-                                             m_Realm, where, options);
-
-                cmd.CommandText = query;
+                sb.Append(options);
+                cmd.CommandText = sb.ToString();
 
                 return DoQuery(cmd);
             }
@@ -204,7 +204,7 @@ namespace OpenSim.Data.MySQL
                         if (m_Fields[name].FieldType == typeof(bool))
                         {
                             int v = Convert.ToInt32(reader[name]);
-                            m_Fields[name].SetValue(row, v != 0 ? true : false);
+                            m_Fields[name].SetValue(row, v != 0);
                         }
                         else if (m_Fields[name].FieldType == typeof(UUID))
                         {
diff --git a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
index 16637c3..2669aca 100644
--- a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
@@ -836,7 +836,7 @@ namespace OpenSim.Data.MySQL
 
                     const string queryB = "SELECT `profileImage`, `profileFirstImage` FROM `userprofile` WHERE `useruuid` = ?Id";
 
-                    using (MySqlCommand cmd = new MySqlCommand(string.Format (queryB,"`userpicks`"), dbcon))
+                    using (MySqlCommand cmd = new MySqlCommand(queryB, dbcon))
                     {
                         cmd.Parameters.AddWithValue("?Id", avatarId.ToString());
 
diff --git a/OpenSim/Data/MySQL/Resources/XMute.migrations b/OpenSim/Data/MySQL/Resources/XMute.migrations
deleted file mode 100644
index 4ac7f82..0000000
--- a/OpenSim/Data/MySQL/Resources/XMute.migrations
+++ /dev/null
@@ -1,16 +0,0 @@
-:VERSION 1
-
-BEGIN;
-
-CREATE TABLE `XMute` (
-  `AgentID` char(36) NOT NULL,
-  `MuteID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
-  `MuteName` varchar(64) NOT NULL DEFAULT '',
-  `MuteType` int(11) NOT NULL DEFAULT '1',
-  `MuteFlags` int(11) NOT NULL DEFAULT '0',
-  `Stamp` int(11) NOT NULL,
-  UNIQUE KEY `AgentID_2` (`AgentID`,`MuteID`,`MuteName`),
-  KEY `AgentID` (`AgentID`)
-);
-
-COMMIT;