2 files changed, 50 insertions, 0 deletions

diff --git a/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs b/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs
index b63b594..8806c2c 100644
--- a/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs
@@ -228,6 +228,8 @@ namespace OpenSim.Server.Handlers.GridUser
                 int i = 0;
                 foreach (GridUserInfo pinfo in pinfos)
                 {
+                    if(pinfo == null)
+                        continue;
                     Dictionary<string, object> rinfoDict = pinfo.ToKeyValuePairs();
                     result["griduser" + i] = rinfoDict;
                     i++;
diff --git a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
index 21eb790..237ffc7 100644
--- a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
@@ -103,6 +103,8 @@ namespace OpenSim.Server.Handlers.UserAccounts
                         return GetAccount(request);
                     case "getaccounts":
                         return GetAccounts(request);
+                    case "getmultiaccounts":
+                        return GetMultiAccounts(request);
                     case "setaccount":
                         if (m_AllowSetAccount)
                             return StoreAccount(request);
@@ -201,6 +203,52 @@ namespace OpenSim.Server.Handlers.UserAccounts
             return Util.UTF8NoBomEncoding.GetBytes(xmlString);
         }
 
+        byte[] GetMultiAccounts(Dictionary<string, object> request)
+        {
+            UUID scopeID = UUID.Zero;
+            if (request.ContainsKey("ScopeID") && !UUID.TryParse(request["ScopeID"].ToString(), out scopeID))
+                return FailureResult();
+
+            if (!request.ContainsKey("IDS"))
+            {
+                m_log.DebugFormat("[USER SERVICE HANDLER]: GetMultiAccounts called without required uuids argument");
+                return FailureResult();
+            }
+
+            if (!(request["IDS"] is List<string>))
+            {
+                m_log.DebugFormat("[USER SERVICE HANDLER]: GetMultiAccounts input argument was of unexpected type {0}", request["IDS"].GetType().ToString());
+                return FailureResult();
+            }
+
+            List<string> userIDs = (List<string>)request["IDS"];
+
+            List<UserAccount> accounts = m_UserAccountService.GetUserAccounts(scopeID, userIDs);
+
+            Dictionary<string, object> result = new Dictionary<string, object>();
+            if ((accounts == null) || ((accounts != null) && (accounts.Count == 0)))
+            {
+                result["result"] = "null";
+            }
+            else
+            {
+                int i = 0;
+                foreach (UserAccount acc in accounts)
+                {
+                    if(acc == null)
+                        continue;
+                    Dictionary<string, object> rinfoDict = acc.ToKeyValuePairs();
+                    result["account" + i] = rinfoDict;
+                    i++;
+                }
+            }
+
+            string xmlString = ServerUtils.BuildXmlResponse(result);
+
+            //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
+            return Util.UTF8NoBomEncoding.GetBytes(xmlString);
+        }
+
         byte[] StoreAccount(Dictionary<string, object> request)
         {
             UUID principalID = UUID.Zero;