diff options
| author | Melanie | 2013-07-24 03:50:09 +0100 |
|---|---|---|
| committer | Melanie | 2013-07-24 03:50:09 +0100 |
| commit | a7eb1b5b855b3caa6c4622789ef1377830e2f435 (patch) | |
| tree | 2bd58bcd2bd9b37adeb746f4b399b1d98539d1cf /OpenSim/Framework/Console | |
| parent | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-a7eb1b5b855b3caa6c4622789ef1377830e2f435.zip opensim-SC-a7eb1b5b855b3caa6c4622789ef1377830e2f435.tar.gz opensim-SC-a7eb1b5b855b3caa6c4622789ef1377830e2f435.tar.bz2 opensim-SC-a7eb1b5b855b3caa6c4622789ef1377830e2f435.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.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 3e3c2b3..8ad7b0d 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,25000)); // 25 secs timeout | 237 | uri, new PollServiceEventArgs(null, uri, 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, |