diff options
author | Oren Hurvitz | 2013-10-30 12:46:42 +0200 |
---|---|---|
committer | Oren Hurvitz | 2014-03-24 18:01:37 +0100 |
commit | c8583e566dd03d4a854e77c1c690fdc35c550398 (patch) | |
tree | 81883e4d3cc473e8e61037bf081631723d3b1c65 | |
parent | Trim search queries (for users, groups, etc.). I have found that sometimes th... (diff) | |
download | opensim-SC_OLD-c8583e566dd03d4a854e77c1c690fdc35c550398.zip opensim-SC_OLD-c8583e566dd03d4a854e77c1c690fdc35c550398.tar.gz opensim-SC_OLD-c8583e566dd03d4a854e77c1c690fdc35c550398.tar.bz2 opensim-SC_OLD-c8583e566dd03d4a854e77c1c690fdc35c550398.tar.xz |
When searching for users, don't add users from the local cache if they have an invalid UUID
Resolves http://opensimulator.org/mantis/view.php?id=6935
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs index 9f0a719..3455e2c 100644 --- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs +++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | |||
@@ -278,7 +278,8 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
278 | { | 278 | { |
279 | foreach (UserData data in m_UserCache.Values) | 279 | foreach (UserData data in m_UserCache.Values) |
280 | { | 280 | { |
281 | if (users.Find(delegate(UserData d) { return d.Id == data.Id; }) == null && | 281 | if (data.Id != UUID.Zero && |
282 | users.Find(delegate(UserData d) { return d.Id == data.Id; }) == null && | ||
282 | (data.FirstName.ToLower().StartsWith(query.ToLower()) || data.LastName.ToLower().StartsWith(query.ToLower()))) | 283 | (data.FirstName.ToLower().StartsWith(query.ToLower()) || data.LastName.ToLower().StartsWith(query.ToLower()))) |
283 | users.Add(data); | 284 | users.Add(data); |
284 | } | 285 | } |
@@ -725,4 +726,4 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
725 | 726 | ||
726 | } | 727 | } |
727 | 728 | ||
728 | } \ No newline at end of file | 729 | } |