OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix failure to find avatars due to trainling spaces being sent by viewers.

avinationmerge
Melanie 2011-07-23 18:29:43 +02:00
parent b5fcd2caba
commit c2de0c930c
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
View File

@ -378,7 +378,10 @@ namespace OpenSim.Region.Framework.Scenes
List<UserAccount> accounts = UserAccountService.GetUserAccounts(RegionInfo.ScopeID, query); List<UserAccount> accounts = UserAccountService.GetUserAccounts(RegionInfo.ScopeID, query);
if (accounts == null) if (accounts == null)
{
m_log.DebugFormat("[LLCIENT]: ProcessAvatarPickerRequest: returned null result");
return; return;
}
AvatarPickerReplyPacket replyPacket = (AvatarPickerReplyPacket) PacketPool.Instance.GetPacket(PacketType.AvatarPickerReply); AvatarPickerReplyPacket replyPacket = (AvatarPickerReplyPacket) PacketPool.Instance.GetPacket(PacketType.AvatarPickerReply);
// TODO: don't create new blocks if recycling an old packet // TODO: don't create new blocks if recycling an old packet

2
OpenSim/Services/UserAccountService/UserAccountService.cs
View File

@ -288,7 +288,7 @@ namespace OpenSim.Services.UserAccountService
public List<UserAccount> GetUserAccounts(UUID scopeID, string query) public List<UserAccount> GetUserAccounts(UUID scopeID, string query)
{ {
UserAccountData[] d = m_Database.GetUsers(scopeID, query); UserAccountData[] d = m_Database.GetUsers(scopeID, query.Trim());
if (d == null) if (d == null)
return new List<UserAccount>(); return new List<UserAccount>();