aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Console
diff options
context:
space:
mode:
authorMelanie2009-09-21 18:11:40 +0100
committerMelanie2009-09-21 18:11:40 +0100
commitbc9e4cfd961e6ed0184165e4f3cbb770b47a8dff (patch)
tree3c66054deffbafcc10354880d33676e03f9341a9 /OpenSim/Framework/Console
parentAdd a UUID param to NoEvents in PollServiceEventArgs to make it more generic (diff)
downloadopensim-SC_OLD-bc9e4cfd961e6ed0184165e4f3cbb770b47a8dff.zip
opensim-SC_OLD-bc9e4cfd961e6ed0184165e4f3cbb770b47a8dff.tar.gz
opensim-SC_OLD-bc9e4cfd961e6ed0184165e4f3cbb770b47a8dff.tar.bz2
opensim-SC_OLD-bc9e4cfd961e6ed0184165e4f3cbb770b47a8dff.tar.xz
Add a RequestID (UUID.Random()) to the PollRequest and pass it to all
even hander delegates.
Diffstat (limited to 'OpenSim/Framework/Console')
-rw-r--r--OpenSim/Framework/Console/RemoteConsole.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Framework/Console/RemoteConsole.cs b/OpenSim/Framework/Console/RemoteConsole.cs
index 5a18b94..76276a5 100644
--- a/OpenSim/Framework/Console/RemoteConsole.cs
+++ b/OpenSim/Framework/Console/RemoteConsole.cs
@@ -370,7 +370,7 @@ namespace OpenSim.Framework.Console
370 } 370 }
371 } 371 }
372 372
373 private bool HasEvents(UUID sessionID) 373 private bool HasEvents(UUID RequestID, UUID sessionID)
374 { 374 {
375 ConsoleConnection c = null; 375 ConsoleConnection c = null;
376 376
@@ -386,19 +386,19 @@ namespace OpenSim.Framework.Console
386 return false; 386 return false;
387 } 387 }
388 388
389 private Hashtable GetEvents(UUID sessionID, string request) 389 private Hashtable GetEvents(UUID RequestID, UUID sessionID, string request)
390 { 390 {
391 ConsoleConnection c = null; 391 ConsoleConnection c = null;
392 392
393 lock (m_Connections) 393 lock (m_Connections)
394 { 394 {
395 if (!m_Connections.ContainsKey(sessionID)) 395 if (!m_Connections.ContainsKey(sessionID))
396 return NoEvents(UUID.Zero); 396 return NoEvents(RequestID, UUID.Zero);
397 c = m_Connections[sessionID]; 397 c = m_Connections[sessionID];
398 } 398 }
399 c.last = System.Environment.TickCount; 399 c.last = System.Environment.TickCount;
400 if (c.lastLineSeen >= m_LineNumber) 400 if (c.lastLineSeen >= m_LineNumber)
401 return NoEvents(UUID.Zero); 401 return NoEvents(RequestID, UUID.Zero);
402 402
403 Hashtable result = new Hashtable(); 403 Hashtable result = new Hashtable();
404 404
@@ -440,7 +440,7 @@ namespace OpenSim.Framework.Console
440 return result; 440 return result;
441 } 441 }
442 442
443 private Hashtable NoEvents(UUID id) 443 private Hashtable NoEvents(UUID RequestID, UUID id)
444 { 444 {
445 Hashtable result = new Hashtable(); 445 Hashtable result = new Hashtable();
446 446