diff options
| author | Melanie | 2011-07-31 17:04:22 +0200 |
|---|---|---|
| committer | Melanie | 2011-07-31 17:04:22 +0200 |
| commit | 434091d3f4913a0fd9b229471d3d65369327e0ec (patch) | |
| tree | fb4bad06665ff511b8aad36e06e950ede003b240 /OpenSim | |
| parent | Ensure that packet headers get parsed correctly (diff) | |
| download | opensim-SC_OLD-434091d3f4913a0fd9b229471d3d65369327e0ec.zip opensim-SC_OLD-434091d3f4913a0fd9b229471d3d65369327e0ec.tar.gz opensim-SC_OLD-434091d3f4913a0fd9b229471d3d65369327e0ec.tar.bz2 opensim-SC_OLD-434091d3f4913a0fd9b229471d3d65369327e0ec.tar.xz | |
Allow removing users from search and avatar picker
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLUserAccountData.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/MySQLUserAccountData.cs b/OpenSim/Data/MySQL/MySQLUserAccountData.cs index a621d84..a18ac66 100644 --- a/OpenSim/Data/MySQL/MySQLUserAccountData.cs +++ b/OpenSim/Data/MySQL/MySQLUserAccountData.cs | |||
| @@ -70,13 +70,13 @@ namespace OpenSim.Data.MySQL | |||
| 70 | 70 | ||
| 71 | if (words.Length == 1) | 71 | if (words.Length == 1) |
| 72 | { | 72 | { |
| 73 | cmd.CommandText = String.Format("select * from {0} where (ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like ?search or LastName like ?search)", m_Realm); | 73 | cmd.CommandText = String.Format("select * from {0} where (ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like ?search or LastName like ?search) and active=1", m_Realm); |
| 74 | cmd.Parameters.AddWithValue("?search", words[0] + "%"); | 74 | cmd.Parameters.AddWithValue("?search", words[0] + "%"); |
| 75 | cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString()); | 75 | cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString()); |
| 76 | } | 76 | } |
| 77 | else | 77 | else |
| 78 | { | 78 | { |
| 79 | cmd.CommandText = String.Format("select * from {0} where (ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like ?searchFirst and LastName like ?searchLast)", m_Realm); | 79 | cmd.CommandText = String.Format("select * from {0} where (ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like ?searchFirst and LastName like ?searchLast) and active=1", m_Realm); |
| 80 | cmd.Parameters.AddWithValue("?searchFirst", words[0] + "%"); | 80 | cmd.Parameters.AddWithValue("?searchFirst", words[0] + "%"); |
| 81 | cmd.Parameters.AddWithValue("?searchLast", words[1] + "%"); | 81 | cmd.Parameters.AddWithValue("?searchLast", words[1] + "%"); |
| 82 | cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString()); | 82 | cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString()); |