aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Console
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-12-07 12:28:42 +0000
committerJustin Clark-Casey (justincc)2011-12-07 12:28:42 +0000
commite6272b8d56dd7856faf374e7ac29460b4e74f1bb (patch)
tree3f6f291c2cbfdd1339264c20520f0b34a2f62356 /OpenSim/Framework/Console
parentStop accidentally setting up the UploadTexture caps handler with the same url... (diff)
downloadopensim-SC_OLD-e6272b8d56dd7856faf374e7ac29460b4e74f1bb.zip
opensim-SC_OLD-e6272b8d56dd7856faf374e7ac29460b4e74f1bb.tar.gz
opensim-SC_OLD-e6272b8d56dd7856faf374e7ac29460b4e74f1bb.tar.bz2
opensim-SC_OLD-e6272b8d56dd7856faf374e7ac29460b4e74f1bb.tar.xz
Stop also adding an ordinary http handler when we set up a poll http handler.
It appears that this is entirely unnecessary since the poll http handlers are dealt with on a separate code path.
Diffstat (limited to 'OpenSim/Framework/Console')
-rw-r--r--OpenSim/Framework/Console/RemoteConsole.cs10
1 files changed, 2 insertions, 8 deletions
diff --git a/OpenSim/Framework/Console/RemoteConsole.cs b/OpenSim/Framework/Console/RemoteConsole.cs
index 07de27a..eabb62d 100644
--- a/OpenSim/Framework/Console/RemoteConsole.cs
+++ b/OpenSim/Framework/Console/RemoteConsole.cs
@@ -232,9 +232,8 @@ namespace OpenSim.Framework.Console
232 232
233 string uri = "/ReadResponses/" + sessionID.ToString() + "/"; 233 string uri = "/ReadResponses/" + sessionID.ToString() + "/";
234 234
235 m_Server.AddPollServiceHTTPHandler(uri, HandleHttpPoll, 235 m_Server.AddPollServiceHTTPHandler(
236 new PollServiceEventArgs(null, HasEvents, GetEvents, NoEvents, 236 uri, new PollServiceEventArgs(null, HasEvents, GetEvents, NoEvents, sessionID));
237 sessionID));
238 237
239 XmlDocument xmldoc = new XmlDocument(); 238 XmlDocument xmldoc = new XmlDocument();
240 XmlNode xmlnode = xmldoc.CreateNode(XmlNodeType.XmlDeclaration, 239 XmlNode xmlnode = xmldoc.CreateNode(XmlNodeType.XmlDeclaration,
@@ -266,11 +265,6 @@ namespace OpenSim.Framework.Console
266 return reply; 265 return reply;
267 } 266 }
268 267
269 private Hashtable HandleHttpPoll(Hashtable request)
270 {
271 return new Hashtable();
272 }
273
274 private Hashtable HandleHttpCloseSession(Hashtable request) 268 private Hashtable HandleHttpCloseSession(Hashtable request)
275 { 269 {
276 DoExpire(); 270 DoExpire();