diff options
| author | Diva Canto | 2013-06-08 11:01:20 -0700 |
|---|---|---|
| committer | Diva Canto | 2013-06-08 11:01:20 -0700 |
| commit | 4e2e69bd250524710c4026f457141fc72adf70ac (patch) | |
| tree | 981a2a5e11a93f8efdea0834b1c9ff9105c03061 /OpenSim/Framework/Console/RemoteConsole.cs | |
| parent | Groups V2 -- fix mantis #6666 (diff) | |
| parent | Catch exception triggered by incoming avatars using legacy profiles (diff) | |
| download | opensim-SC_OLD-4e2e69bd250524710c4026f457141fc72adf70ac.zip opensim-SC_OLD-4e2e69bd250524710c4026f457141fc72adf70ac.tar.gz opensim-SC_OLD-4e2e69bd250524710c4026f457141fc72adf70ac.tar.bz2 opensim-SC_OLD-4e2e69bd250524710c4026f457141fc72adf70ac.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Console/RemoteConsole.cs')
| -rw-r--r-- | OpenSim/Framework/Console/RemoteConsole.cs | 4 |
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 | ||