diff options
Diffstat (limited to 'OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs')
-rw-r--r-- | OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs b/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs index 2558fa0..d914d32 100644 --- a/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs | |||
@@ -68,13 +68,13 @@ namespace OpenSim.Server.Handlers.Presence | |||
68 | 68 | ||
69 | try | 69 | try |
70 | { | 70 | { |
71 | Dictionary<string, string> request = | 71 | Dictionary<string, object> request = |
72 | ServerUtils.ParseQueryString(body); | 72 | ServerUtils.ParseQueryString(body); |
73 | 73 | ||
74 | if (!request.ContainsKey("METHOD")) | 74 | if (!request.ContainsKey("METHOD")) |
75 | return FailureResult(); | 75 | return FailureResult(); |
76 | 76 | ||
77 | string method = request["METHOD"]; | 77 | string method = request["METHOD"].ToString(); |
78 | 78 | ||
79 | switch (method) | 79 | switch (method) |
80 | { | 80 | { |
@@ -92,12 +92,11 @@ namespace OpenSim.Server.Handlers.Presence | |||
92 | 92 | ||
93 | } | 93 | } |
94 | 94 | ||
95 | byte[] Report(Dictionary<string, string> request) | 95 | byte[] Report(Dictionary<string, object> request) |
96 | { | 96 | { |
97 | PresenceInfo info = new PresenceInfo(); | 97 | PresenceInfo info = new PresenceInfo(); |
98 | info.Data = new Dictionary<string, string>(); | ||
99 | 98 | ||
100 | if (request["PrincipalID"] == null || request["RegionID"] == null) | 99 | if (!request.ContainsKey("PrincipalID") || !request.ContainsKey("RegionID")) |
101 | return FailureResult(); | 100 | return FailureResult(); |
102 | 101 | ||
103 | if (!UUID.TryParse(request["PrincipalID"].ToString(), | 102 | if (!UUID.TryParse(request["PrincipalID"].ToString(), |
@@ -108,18 +107,9 @@ namespace OpenSim.Server.Handlers.Presence | |||
108 | out info.RegionID)) | 107 | out info.RegionID)) |
109 | return FailureResult(); | 108 | return FailureResult(); |
110 | 109 | ||
111 | foreach (KeyValuePair<string, string> kvp in request) | ||
112 | { | ||
113 | if (kvp.Key == "METHOD" || | ||
114 | kvp.Key == "PrincipalID" || | ||
115 | kvp.Key == "RegionID") | ||
116 | continue; | ||
117 | |||
118 | info.Data[kvp.Key] = kvp.Value; | ||
119 | } | ||
120 | 110 | ||
121 | if (m_PresenceService.Report(info)) | 111 | // if (m_PresenceService.ReportAgent(info)) |
122 | return SuccessResult(); | 112 | // return SuccessResult(); |
123 | 113 | ||
124 | return FailureResult(); | 114 | return FailureResult(); |
125 | } | 115 | } |