Allow removing users from search and avatar picker
parent
04eaca2af8
commit
434091d3f4
|
@ -70,13 +70,13 @@ namespace OpenSim.Data.MySQL
|
||||||
|
|
||||||
if (words.Length == 1)
|
if (words.Length == 1)
|
||||||
{
|
{
|
||||||
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);
|
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);
|
||||||
cmd.Parameters.AddWithValue("?search", words[0] + "%");
|
cmd.Parameters.AddWithValue("?search", words[0] + "%");
|
||||||
cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString());
|
cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString());
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
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);
|
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);
|
||||||
cmd.Parameters.AddWithValue("?searchFirst", words[0] + "%");
|
cmd.Parameters.AddWithValue("?searchFirst", words[0] + "%");
|
||||||
cmd.Parameters.AddWithValue("?searchLast", words[1] + "%");
|
cmd.Parameters.AddWithValue("?searchLast", words[1] + "%");
|
||||||
cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString());
|
cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString());
|
||||||
|
|
Loading…
Reference in New Issue