diff options
author | Melanie | 2011-07-23 18:29:43 +0200 |
---|---|---|
committer | Melanie | 2011-07-23 18:29:43 +0200 |
commit | c2de0c930c526157b464ce7a7d17a37042a3676c (patch) | |
tree | 8e4797ca1fc3be3a7702583260a450e53e0fb192 /OpenSim | |
parent | Fix some local id issues in physics glue (diff) | |
download | opensim-SC_OLD-c2de0c930c526157b464ce7a7d17a37042a3676c.zip opensim-SC_OLD-c2de0c930c526157b464ce7a7d17a37042a3676c.tar.gz opensim-SC_OLD-c2de0c930c526157b464ce7a7d17a37042a3676c.tar.bz2 opensim-SC_OLD-c2de0c930c526157b464ce7a7d17a37042a3676c.tar.xz |
Fix failure to find avatars due to trainling spaces being sent by viewers.
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | 3 | ||||
-rw-r--r-- | OpenSim/Services/UserAccountService/UserAccountService.cs | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs index 44472b2..9bef443 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | |||
@@ -378,7 +378,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
378 | List<UserAccount> accounts = UserAccountService.GetUserAccounts(RegionInfo.ScopeID, query); | 378 | List<UserAccount> accounts = UserAccountService.GetUserAccounts(RegionInfo.ScopeID, query); |
379 | 379 | ||
380 | if (accounts == null) | 380 | if (accounts == null) |
381 | { | ||
382 | m_log.DebugFormat("[LLCIENT]: ProcessAvatarPickerRequest: returned null result"); | ||
381 | return; | 383 | return; |
384 | } | ||
382 | 385 | ||
383 | AvatarPickerReplyPacket replyPacket = (AvatarPickerReplyPacket) PacketPool.Instance.GetPacket(PacketType.AvatarPickerReply); | 386 | AvatarPickerReplyPacket replyPacket = (AvatarPickerReplyPacket) PacketPool.Instance.GetPacket(PacketType.AvatarPickerReply); |
384 | // TODO: don't create new blocks if recycling an old packet | 387 | // TODO: don't create new blocks if recycling an old packet |
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs index dbf5ef4..7a46165 100644 --- a/OpenSim/Services/UserAccountService/UserAccountService.cs +++ b/OpenSim/Services/UserAccountService/UserAccountService.cs | |||
@@ -288,7 +288,7 @@ namespace OpenSim.Services.UserAccountService | |||
288 | 288 | ||
289 | public List<UserAccount> GetUserAccounts(UUID scopeID, string query) | 289 | public List<UserAccount> GetUserAccounts(UUID scopeID, string query) |
290 | { | 290 | { |
291 | UserAccountData[] d = m_Database.GetUsers(scopeID, query); | 291 | UserAccountData[] d = m_Database.GetUsers(scopeID, query.Trim()); |
292 | 292 | ||
293 | if (d == null) | 293 | if (d == null) |
294 | return new List<UserAccount>(); | 294 | return new List<UserAccount>(); |