From c8583e566dd03d4a854e77c1c690fdc35c550398 Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Wed, 30 Oct 2013 12:46:42 +0200
Subject: 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
---
.../CoreModules/Framework/UserManagement/UserManagementModule.cs | 5 +++--
1 file 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
{
foreach (UserData data in m_UserCache.Values)
{
- if (users.Find(delegate(UserData d) { return d.Id == data.Id; }) == null &&
+ if (data.Id != UUID.Zero &&
+ users.Find(delegate(UserData d) { return d.Id == data.Id; }) == null &&
(data.FirstName.ToLower().StartsWith(query.ToLower()) || data.LastName.ToLower().StartsWith(query.ToLower())))
users.Add(data);
}
@@ -725,4 +726,4 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
}
-}
\ No newline at end of file
+}
--
cgit v1.1