From bc9e4cfd961e6ed0184165e4f3cbb770b47a8dff Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 21 Sep 2009 18:11:40 +0100
Subject: Add a RequestID (UUID.Random()) to the PollRequest and pass it to all
 even hander delegates.

---
 OpenSim/Framework/Console/RemoteConsole.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Framework/Console')

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
             }
         }
 
-        private bool HasEvents(UUID sessionID)
+        private bool HasEvents(UUID RequestID, UUID sessionID)
         {
             ConsoleConnection c = null;
 
@@ -386,19 +386,19 @@ namespace OpenSim.Framework.Console
             return false;
         }
 
-        private Hashtable GetEvents(UUID sessionID, string request)
+        private Hashtable GetEvents(UUID RequestID, UUID sessionID, string request)
         {
             ConsoleConnection c = null;
 
             lock (m_Connections)
             {
                 if (!m_Connections.ContainsKey(sessionID))
-                    return NoEvents(UUID.Zero);
+                    return NoEvents(RequestID, UUID.Zero);
                 c = m_Connections[sessionID];
             }
             c.last = System.Environment.TickCount;
             if (c.lastLineSeen >= m_LineNumber)
-                return NoEvents(UUID.Zero);
+                return NoEvents(RequestID, UUID.Zero);
 
             Hashtable result = new Hashtable();
 
@@ -440,7 +440,7 @@ namespace OpenSim.Framework.Console
             return result;
         }
 
-        private Hashtable NoEvents(UUID id)
+        private Hashtable NoEvents(UUID RequestID, UUID id)
         {
             Hashtable result = new Hashtable();
 
-- 
cgit v1.1