diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Console/RemoteConsole.cs | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/OpenSim/Framework/Console/RemoteConsole.cs b/OpenSim/Framework/Console/RemoteConsole.cs index 67bff4c..c27072c 100644 --- a/OpenSim/Framework/Console/RemoteConsole.cs +++ b/OpenSim/Framework/Console/RemoteConsole.cs | |||
@@ -197,8 +197,8 @@ namespace OpenSim.Framework.Console | |||
197 | 197 | ||
198 | string uri = "/ReadResponses/" + sessionID.ToString() + "/"; | 198 | string uri = "/ReadResponses/" + sessionID.ToString() + "/"; |
199 | 199 | ||
200 | m_Server.AddPollServiceHTTPHandler(uri, HandleHttpCloseSession, | 200 | m_Server.AddPollServiceHTTPHandler(uri, HandleHttpPoll, |
201 | new PollServiceEventArgs(HasEvents, GetEvents, NoEvents, | 201 | new PollServiceEventArgs(null, HasEvents, GetEvents, NoEvents, |
202 | sessionID)); | 202 | sessionID)); |
203 | 203 | ||
204 | XmlDocument xmldoc = new XmlDocument(); | 204 | XmlDocument xmldoc = new XmlDocument(); |
@@ -230,6 +230,11 @@ namespace OpenSim.Framework.Console | |||
230 | return reply; | 230 | return reply; |
231 | } | 231 | } |
232 | 232 | ||
233 | private Hashtable HandleHttpPoll(Hashtable request) | ||
234 | { | ||
235 | return new Hashtable(); | ||
236 | } | ||
237 | |||
233 | private Hashtable HandleHttpCloseSession(Hashtable request) | 238 | private Hashtable HandleHttpCloseSession(Hashtable request) |
234 | { | 239 | { |
235 | DoExpire(); | 240 | DoExpire(); |
@@ -365,7 +370,7 @@ namespace OpenSim.Framework.Console | |||
365 | } | 370 | } |
366 | } | 371 | } |
367 | 372 | ||
368 | private bool HasEvents(UUID sessionID) | 373 | private bool HasEvents(UUID RequestID, UUID sessionID) |
369 | { | 374 | { |
370 | ConsoleConnection c = null; | 375 | ConsoleConnection c = null; |
371 | 376 | ||
@@ -381,19 +386,19 @@ namespace OpenSim.Framework.Console | |||
381 | return false; | 386 | return false; |
382 | } | 387 | } |
383 | 388 | ||
384 | private Hashtable GetEvents(UUID sessionID, string request) | 389 | private Hashtable GetEvents(UUID RequestID, UUID sessionID, string request) |
385 | { | 390 | { |
386 | ConsoleConnection c = null; | 391 | ConsoleConnection c = null; |
387 | 392 | ||
388 | lock (m_Connections) | 393 | lock (m_Connections) |
389 | { | 394 | { |
390 | if (!m_Connections.ContainsKey(sessionID)) | 395 | if (!m_Connections.ContainsKey(sessionID)) |
391 | return NoEvents(); | 396 | return NoEvents(RequestID, UUID.Zero); |
392 | c = m_Connections[sessionID]; | 397 | c = m_Connections[sessionID]; |
393 | } | 398 | } |
394 | c.last = System.Environment.TickCount; | 399 | c.last = System.Environment.TickCount; |
395 | if (c.lastLineSeen >= m_LineNumber) | 400 | if (c.lastLineSeen >= m_LineNumber) |
396 | return NoEvents(); | 401 | return NoEvents(RequestID, UUID.Zero); |
397 | 402 | ||
398 | Hashtable result = new Hashtable(); | 403 | Hashtable result = new Hashtable(); |
399 | 404 | ||
@@ -435,7 +440,7 @@ namespace OpenSim.Framework.Console | |||
435 | return result; | 440 | return result; |
436 | } | 441 | } |
437 | 442 | ||
438 | private Hashtable NoEvents() | 443 | private Hashtable NoEvents(UUID RequestID, UUID id) |
439 | { | 444 | { |
440 | Hashtable result = new Hashtable(); | 445 | Hashtable result = new Hashtable(); |
441 | 446 | ||