Merge branch 'master' into careminster

1 files changed, 27 insertions, 0 deletions

diff --git a/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs b/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs
index 9ca5120..2558fa0 100644
--- a/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs
@@ -94,6 +94,33 @@ namespace OpenSim.Server.Handlers.Presence
 
         byte[] Report(Dictionary<string, string> request)
         {
+            PresenceInfo info = new PresenceInfo();
+            info.Data = new Dictionary<string, string>();
+
+            if (request["PrincipalID"] == null || request["RegionID"] == null)
+                return FailureResult();
+
+            if (!UUID.TryParse(request["PrincipalID"].ToString(),
+                    out info.PrincipalID))
+                return FailureResult();
+
+            if (!UUID.TryParse(request["RegionID"].ToString(),
+                    out info.RegionID))
+                return FailureResult();
+
+            foreach (KeyValuePair<string, string> kvp in request)
+            {
+                if (kvp.Key == "METHOD" ||
+                        kvp.Key == "PrincipalID" ||
+                        kvp.Key == "RegionID")
+                    continue;
+
+                info.Data[kvp.Key] = kvp.Value;
+            }
+
+            if (m_PresenceService.Report(info))
+                return SuccessResult();
+
             return FailureResult();
         }