change previus code, send a NoEvents response back to http server, even
if we know there is no one there, so that the server finishes handling it.avinationmerge
parent
ee951f7a10
commit
86a9710e77
|
@ -204,9 +204,6 @@ namespace OpenSim.Framework.Servers.HttpServer
|
||||||
{
|
{
|
||||||
Hashtable responsedata = req.PollServiceArgs.GetEvents(req.RequestID, req.PollServiceArgs.Id);
|
Hashtable responsedata = req.PollServiceArgs.GetEvents(req.RequestID, req.PollServiceArgs.Id);
|
||||||
|
|
||||||
if (responsedata == null)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
if (req.PollServiceArgs.Type == PollServiceEventArgs.EventType.LongPoll) // This is the event queue
|
if (req.PollServiceArgs.Type == PollServiceEventArgs.EventType.LongPoll) // This is the event queue
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
|
|
|
@ -380,8 +380,7 @@ namespace OpenSim.Region.ClientStack.Linden
|
||||||
Queue<OSD> queue = GetQueue(pAgentId);
|
Queue<OSD> queue = GetQueue(pAgentId);
|
||||||
if (queue == null)
|
if (queue == null)
|
||||||
{
|
{
|
||||||
//return NoEvents(requestID, pAgentId);
|
return NoEvents(requestID, pAgentId);
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
OSD element;
|
OSD element;
|
||||||
|
|
Loading…
Reference in New Issue