aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Console/RemoteConsole.cs
diff options
context:
space:
mode:
authorMelanie2013-06-07 23:43:45 +0100
committerMelanie2013-06-07 23:43:45 +0100
commit7c0bfca7a03584dd65c5659f177b434ee94ddc9d (patch)
tree82ceefae330b2c2b80a20db68abd79ae2439b034 /OpenSim/Framework/Console/RemoteConsole.cs
parentminor: add dr0berts to contributors list (diff)
downloadopensim-SC-7c0bfca7a03584dd65c5659f177b434ee94ddc9d.zip
opensim-SC-7c0bfca7a03584dd65c5659f177b434ee94ddc9d.tar.gz
opensim-SC-7c0bfca7a03584dd65c5659f177b434ee94ddc9d.tar.bz2
opensim-SC-7c0bfca7a03584dd65c5659f177b434ee94ddc9d.tar.xz
Adding Avination's PollService to round out the HTTP inventory changes
Diffstat (limited to 'OpenSim/Framework/Console/RemoteConsole.cs')
-rw-r--r--OpenSim/Framework/Console/RemoteConsole.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Console/RemoteConsole.cs b/OpenSim/Framework/Console/RemoteConsole.cs
index 27edd4b..3e3c2b3 100644
--- a/OpenSim/Framework/Console/RemoteConsole.cs
+++ b/OpenSim/Framework/Console/RemoteConsole.cs
@@ -234,7 +234,7 @@ namespace OpenSim.Framework.Console
234 string uri = "/ReadResponses/" + sessionID.ToString() + "/"; 234 string uri = "/ReadResponses/" + sessionID.ToString() + "/";
235 235
236 m_Server.AddPollServiceHTTPHandler( 236 m_Server.AddPollServiceHTTPHandler(
237 uri, new PollServiceEventArgs(null, HasEvents, GetEvents, NoEvents, sessionID)); 237 uri, new PollServiceEventArgs(null, HasEvents, GetEvents, NoEvents, sessionID,25000)); // 25 secs timeout
238 238
239 XmlDocument xmldoc = new XmlDocument(); 239 XmlDocument xmldoc = new XmlDocument();
240 XmlNode xmlnode = xmldoc.CreateNode(XmlNodeType.XmlDeclaration, 240 XmlNode xmlnode = xmldoc.CreateNode(XmlNodeType.XmlDeclaration,
@@ -425,7 +425,7 @@ namespace OpenSim.Framework.Console
425 return false; 425 return false;
426 } 426 }
427 427
428 private Hashtable GetEvents(UUID RequestID, UUID sessionID, string request) 428 private Hashtable GetEvents(UUID RequestID, UUID sessionID)
429 { 429 {
430 ConsoleConnection c = null; 430 ConsoleConnection c = null;
431 431