diff options
| author | Justin Clark-Casey (justincc) | 2014-03-25 00:20:38 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2014-03-25 00:20:38 +0000 |
| commit | 091f3a80008a0f4a756fcb9ff4e87a24c2948c3c (patch) | |
| tree | a98354e9317e0ed6892dec344a69447c0e9c70b8 /OpenSim/Data/MySQL/MySQLGroupsData.cs | |
| parent | Don't fail to enable permissions modules correctly if there is any leading or... (diff) | |
| parent | Fixed Debug command for Groups. (Use of wrong capitalization caused *two* "de... (diff) | |
| download | opensim-SC_OLD-091f3a80008a0f4a756fcb9ff4e87a24c2948c3c.zip opensim-SC_OLD-091f3a80008a0f4a756fcb9ff4e87a24c2948c3c.tar.gz opensim-SC_OLD-091f3a80008a0f4a756fcb9ff4e87a24c2948c3c.tar.bz2 opensim-SC_OLD-091f3a80008a0f4a756fcb9ff4e87a24c2948c3c.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLGroupsData.cs')
| -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) |