diff options
author | Justin Clark-Casey (justincc) | 2011-12-07 12:28:42 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-12-07 12:28:42 +0000 |
commit | e6272b8d56dd7856faf374e7ac29460b4e74f1bb (patch) | |
tree | 3f6f291c2cbfdd1339264c20520f0b34a2f62356 /OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs | |
parent | Stop accidentally setting up the UploadTexture caps handler with the same url... (diff) | |
download | opensim-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 '')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs index 9f27abc..8ba6f61 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs | |||
@@ -361,7 +361,6 @@ namespace OpenSim.Region.ClientStack.Linden | |||
361 | // This will persist this beyond the expiry of the caps handlers | 361 | // This will persist this beyond the expiry of the caps handlers |
362 | MainServer.Instance.AddPollServiceHTTPHandler( | 362 | MainServer.Instance.AddPollServiceHTTPHandler( |
363 | capsBase + EventQueueGetUUID.ToString() + "/", | 363 | capsBase + EventQueueGetUUID.ToString() + "/", |
364 | EventQueuePoll, | ||
365 | new PollServiceEventArgs(null, HasEvents, GetEvents, NoEvents, agentID)); | 364 | new PollServiceEventArgs(null, HasEvents, GetEvents, NoEvents, agentID)); |
366 | 365 | ||
367 | Random rnd = new Random(Environment.TickCount); | 366 | Random rnd = new Random(Environment.TickCount); |
@@ -578,11 +577,6 @@ namespace OpenSim.Region.ClientStack.Linden | |||
578 | // return responsedata; | 577 | // return responsedata; |
579 | // } | 578 | // } |
580 | 579 | ||
581 | public Hashtable EventQueuePoll(Hashtable request) | ||
582 | { | ||
583 | return new Hashtable(); | ||
584 | } | ||
585 | |||
586 | // public Hashtable EventQueuePath2(Hashtable request) | 580 | // public Hashtable EventQueuePath2(Hashtable request) |
587 | // { | 581 | // { |
588 | // string capuuid = (string)request["uri"]; //path.Replace("/CAPS/EQG/",""); | 582 | // string capuuid = (string)request["uri"]; //path.Replace("/CAPS/EQG/",""); |