diff options
| author | Melanie | 2012-07-06 20:51:18 +0100 |
|---|---|---|
| committer | Melanie | 2012-07-06 20:51:18 +0100 |
| commit | 26d89777d88c9abfa35fed0b78bcd8f93c3d0bf2 (patch) | |
| tree | bf9802d765a4965dd1b42c4b2d3145b5813c0c1f /OpenSim/Framework/Console | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | added llSetVelocity. will refuse to work on vehicles and on attachments ( th... (diff) | |
| download | opensim-SC-26d89777d88c9abfa35fed0b78bcd8f93c3d0bf2.zip opensim-SC-26d89777d88c9abfa35fed0b78bcd8f93c3d0bf2.tar.gz opensim-SC-26d89777d88c9abfa35fed0b78bcd8f93c3d0bf2.tar.bz2 opensim-SC-26d89777d88c9abfa35fed0b78bcd8f93c3d0bf2.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/Console/RemoteConsole.cs | 2 |
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, |