1 files changed, 16 insertions, 1 deletions

diff --git a/OpenSim/Data/MySQL/MySQLUserAccountData.cs b/OpenSim/Data/MySQL/MySQLUserAccountData.cs
index aa69d68..92afa75 100644
--- a/OpenSim/Data/MySQL/MySQLUserAccountData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserAccountData.cs
@@ -72,7 +72,7 @@ namespace OpenSim.Data.MySQL
             }
             else
             {
-                cmd.CommandText = String.Format("select * from {0} where (ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like ?searchFirst or LastName like ?searchLast)", m_Realm);
+                cmd.CommandText = String.Format("select * from {0} where (ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like ?searchFirst and LastName like ?searchLast)", m_Realm);
                 cmd.Parameters.AddWithValue("?searchFirst", "%" + words[0] + "%");
                 cmd.Parameters.AddWithValue("?searchLast", "%" + words[1] + "%");
                 cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString());
@@ -80,5 +80,20 @@ namespace OpenSim.Data.MySQL
 
             return DoQuery(cmd);
         }
+
+        public UserAccountData[] GetUsersWhere(UUID scopeID, string where)
+        {
+            MySqlCommand cmd = new MySqlCommand();
+
+            if (scopeID != UUID.Zero)
+            {
+                where = "(ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (" + where + ")";
+                cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString());
+            }
+
+            cmd.CommandText = String.Format("select * from {0} where " + where, m_Realm);
+
+            return DoQuery(cmd);
+        }
     }
 }