1 files changed, 10 insertions, 7 deletions

diff --git a/OpenSim/Framework/Data.MySQL/MySQLGridData.cs b/OpenSim/Framework/Data.MySQL/MySQLGridData.cs
index 930b3f4..4d65ee9 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLGridData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLGridData.cs
@@ -176,20 +176,24 @@ namespace OpenSim.Framework.Data.MySQL
         public List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query)
         {
             List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>();
+
+            System.Text.RegularExpressions.Regex objAlphaNumericPattern = new System.Text.RegularExpressions.Regex("[^a-zA-Z0-9]");
+
             string[] querysplit;
             querysplit = query.Split(' ');
             if (querysplit.Length == 2)
             {
+                Dictionary<string, string> param = new Dictionary<string, string>();
+                param["?first"] = objAlphaNumericPattern.Replace(querysplit[0],"") + "%";
+                param["?second"] = objAlphaNumericPattern.Replace(querysplit[1], "") + "%";
                 try
                 {
                     lock (database)
                     {
-                        Dictionary<string, string> param = new Dictionary<string, string>();
-                        param["?first"] = querysplit[0];
-                        param["?second"] = querysplit[1];
+                        
 
                         IDbCommand result =
-                            database.Query("SELECT UUID,username,surname FROM users WHERE username = ?first AND lastname = ?second", param);
+                            database.Query("SELECT UUID,username,surname FROM users WHERE username like ?first AND lastname like ?second LIMIT 100", param);
                         IDataReader reader = result.ExecuteReader();
 
 
@@ -224,11 +228,10 @@ namespace OpenSim.Framework.Data.MySQL
                     lock (database)
                     {
                         Dictionary<string, string> param = new Dictionary<string, string>();
-                        param["?first"] = querysplit[0];
-                        param["?second"] = querysplit[1];
+                        param["?first"] = objAlphaNumericPattern.Replace(querysplit[0],"") + "%";
 
                         IDbCommand result =
-                            database.Query("SELECT UUID,username,surname FROM users WHERE username = ?first OR lastname = ?second", param);
+                            database.Query("SELECT UUID,username,surname FROM users WHERE username like ?first OR lastname like ?second", param);
                         IDataReader reader = result.ExecuteReader();