2 files changed, 4 insertions, 10 deletions

diff --git a/OpenSim/Services/Interfaces/IUserManagement.cs b/OpenSim/Services/Interfaces/IUserManagement.cs
index 3bdf86d..39268c0 100644
--- a/OpenSim/Services/Interfaces/IUserManagement.cs
+++ b/OpenSim/Services/Interfaces/IUserManagement.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Services.Interfaces
         string GetUserUUI(UUID uuid);
         bool GetUserUUI(UUID userID, out string uui);
         string GetUserServerURL(UUID uuid, string serverType);
-        Dictionary<UUID,string> GetUsersNames(string[] ids);
+        Dictionary<UUID,string> GetUsersNames(string[] ids, UUID scopeID);
 
         /// <summary>
         /// Get user ID by the given name.
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs
index 24f436d..9ac8418 100644
--- a/OpenSim/Services/UserAccountService/UserAccountService.cs
+++ b/OpenSim/Services/UserAccountService/UserAccountService.cs
@@ -26,6 +26,7 @@
  */
 
 using System;
+using System.Linq;
 using System.Collections.Generic;
 using System.Reflection;
 using log4net;
@@ -292,15 +293,8 @@ namespace OpenSim.Services.UserAccountService
 
         public List<UserAccount> GetUserAccounts(UUID scopeID, List<string> IDs)
         {
-            // do it one at a time db access should be fast, so no need to break its api
-            List<UserAccount> accs = new List<UserAccount>();
-            UUID uuid = UUID.Zero;
-            foreach(string id in IDs)
-            {
-                if (UUID.TryParse(id, out uuid) && uuid != UUID.Zero)
-                    accs.Add(GetUserAccount(scopeID, uuid));
-            }
-            return accs;
+            UserAccountData[] ret = m_Database.GetUsersWhere(scopeID, "PrincipalID in ('" + String.Join("', '", IDs) + "')");
+            return new List<UserAccount>(ret.Select((x) => MakeUserAccount(x)));
         }
 
         public void InvalidateCache(UUID userID)