diff options
Diffstat (limited to 'OpenSim/Data')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLGroupsData.cs | 6 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/MySQLUserProfilesData.cs | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Data/MySQL/MySQLGroupsData.cs b/OpenSim/Data/MySQL/MySQLGroupsData.cs index 0318284..8e39229 100644 --- a/OpenSim/Data/MySQL/MySQLGroupsData.cs +++ b/OpenSim/Data/MySQL/MySQLGroupsData.cs | |||
@@ -86,11 +86,11 @@ namespace OpenSim.Data.MySQL | |||
86 | public GroupData[] RetrieveGroups(string pattern) | 86 | public GroupData[] RetrieveGroups(string pattern) |
87 | { | 87 | { |
88 | if (string.IsNullOrEmpty(pattern)) | 88 | if (string.IsNullOrEmpty(pattern)) |
89 | pattern = "1 ORDER BY Name LIMIT 100"; | 89 | pattern = "1"; |
90 | else | 90 | else |
91 | pattern = string.Format("Name LIKE '%{0}%' ORDER BY Name LIMIT 100", pattern); | 91 | pattern = string.Format("Name LIKE '%{0}%'", pattern); |
92 | 92 | ||
93 | return m_Groups.Get(pattern); | 93 | return m_Groups.Get(string.Format("ShowInList=1 AND ({0}) ORDER BY Name LIMIT 100", pattern)); |
94 | } | 94 | } |
95 | 95 | ||
96 | public bool DeleteGroup(UUID groupID) | 96 | public bool DeleteGroup(UUID groupID) |
diff --git a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs index 6ed3b06..cc4c5b0 100644 --- a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs +++ b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs | |||
@@ -974,8 +974,8 @@ namespace OpenSim.Data.MySQL | |||
974 | dbcon.Open(); | 974 | dbcon.Open(); |
975 | using (MySqlCommand cmd = new MySqlCommand(query, dbcon)) | 975 | using (MySqlCommand cmd = new MySqlCommand(query, dbcon)) |
976 | { | 976 | { |
977 | cmd.Parameters.AddWithValue("?ImViaEmail", pref.IMViaEmail); | 977 | cmd.Parameters.AddWithValue("?ImViaEmail", pref.IMViaEmail.ToString().ToLower()); |
978 | cmd.Parameters.AddWithValue("?Visible", pref.Visible); | 978 | cmd.Parameters.AddWithValue("?Visible", pref.Visible.ToString().ToLower()); |
979 | cmd.Parameters.AddWithValue("?uuid", pref.UserId.ToString()); | 979 | cmd.Parameters.AddWithValue("?uuid", pref.UserId.ToString()); |
980 | 980 | ||
981 | cmd.ExecuteNonQuery(); | 981 | cmd.ExecuteNonQuery(); |