aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Console/RemoteConsole.cs
diff options
context:
space:
mode:
authorubit2012-07-04 18:41:36 +0200
committerubit2012-07-04 18:41:36 +0200
commitc5d2151674f083f1021984c9cb97f1b2dfdb81cf (patch)
treec89d663463e6d6322ed8dc30f38192c9855302f1 /OpenSim/Framework/Console/RemoteConsole.cs
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parent added a timeout paramenter to PollServiceEventArgs, so each type can define ... (diff)
downloadopensim-SC_OLD-c5d2151674f083f1021984c9cb97f1b2dfdb81cf.zip
opensim-SC_OLD-c5d2151674f083f1021984c9cb97f1b2dfdb81cf.tar.gz
opensim-SC_OLD-c5d2151674f083f1021984c9cb97f1b2dfdb81cf.tar.bz2
opensim-SC_OLD-c5d2151674f083f1021984c9cb97f1b2dfdb81cf.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Framework/Console/RemoteConsole.cs')
-rw-r--r--OpenSim/Framework/Console/RemoteConsole.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Console/RemoteConsole.cs b/OpenSim/Framework/Console/RemoteConsole.cs
index eabb62d..e04ca1e 100644
--- a/OpenSim/Framework/Console/RemoteConsole.cs
+++ b/OpenSim/Framework/Console/RemoteConsole.cs
@@ -233,7 +233,7 @@ namespace OpenSim.Framework.Console
233 string uri = "/ReadResponses/" + sessionID.ToString() + "/"; 233 string uri = "/ReadResponses/" + sessionID.ToString() + "/";
234 234
235 m_Server.AddPollServiceHTTPHandler( 235 m_Server.AddPollServiceHTTPHandler(
236 uri, new PollServiceEventArgs(null, HasEvents, GetEvents, NoEvents, sessionID)); 236 uri, new PollServiceEventArgs(null, HasEvents, GetEvents, NoEvents, sessionID,25000)); // 25 secs timeout
237 237
238 XmlDocument xmldoc = new XmlDocument(); 238 XmlDocument xmldoc = new XmlDocument();
239 XmlNode xmlnode = xmldoc.CreateNode(XmlNodeType.XmlDeclaration, 239 XmlNode xmlnode = xmldoc.CreateNode(XmlNodeType.XmlDeclaration,