diff options
| author | Oren Hurvitz | 2013-10-30 16:15:06 +0200 |
|---|---|---|
| committer | Oren Hurvitz | 2014-03-24 18:01:56 +0100 |
| commit | b9e0d0fdb217f4e5cd90883dca1b2f622dc61c1d (patch) | |
| tree | 03f6d141e2602e3b22e095f43d2888fa40aedc80 | |
| parent | Check settings for groups module (diff) | |
| download | opensim-SC-b9e0d0fdb217f4e5cd90883dca1b2f622dc61c1d.zip opensim-SC-b9e0d0fdb217f4e5cd90883dca1b2f622dc61c1d.tar.gz opensim-SC-b9e0d0fdb217f4e5cd90883dca1b2f622dc61c1d.tar.bz2 opensim-SC-b9e0d0fdb217f4e5cd90883dca1b2f622dc61c1d.tar.xz | |
Don't show hidden groups in search results
Resolves http://opensimulator.org/mantis/view.php?id=6937
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLGroupsData.cs | 6 |
1 files changed, 3 insertions, 3 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) |