From b9e0d0fdb217f4e5cd90883dca1b2f622dc61c1d Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Wed, 30 Oct 2013 16:15:06 +0200
Subject: Don't show hidden groups in search results

Resolves http://opensimulator.org/mantis/view.php?id=6937
---
 OpenSim/Data/MySQL/MySQLGroupsData.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Data/MySQL')

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
         public GroupData[] RetrieveGroups(string pattern)
         {
             if (string.IsNullOrEmpty(pattern))
-                pattern = "1 ORDER BY Name LIMIT 100";
+                pattern = "1";
             else
-                pattern = string.Format("Name LIKE '%{0}%' ORDER BY Name LIMIT 100", pattern);
+                pattern = string.Format("Name LIKE '%{0}%'", pattern);
 
-            return m_Groups.Get(pattern);
+            return m_Groups.Get(string.Format("ShowInList=1 AND ({0}) ORDER BY Name LIMIT 100", pattern));
         }
 
         public bool DeleteGroup(UUID groupID)
-- 
cgit v1.1


From 1b30ae81b5501fbd21b0f589df6286421b0c083a Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Sun, 5 Jan 2014 11:28:33 +0200
Subject: Fixed updating usersettings in the database

Resolves http://opensimulator.org/mantis/view.php?id=6938
---
 OpenSim/Data/MySQL/MySQLUserProfilesData.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Data/MySQL')

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
                     dbcon.Open();
                     using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("?ImViaEmail", pref.IMViaEmail);
-                        cmd.Parameters.AddWithValue("?Visible", pref.Visible);
+                        cmd.Parameters.AddWithValue("?ImViaEmail", pref.IMViaEmail.ToString().ToLower());
+                        cmd.Parameters.AddWithValue("?Visible", pref.Visible.ToString().ToLower());
                         cmd.Parameters.AddWithValue("?uuid", pref.UserId.ToString());
 
                         cmd.ExecuteNonQuery();
-- 
cgit v1.1