OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cosmetics

master
UbitUmarov 2020-05-07 14:26:07 +01:00
parent f0fc1f628f
commit f70f0b5ffd
3 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
View File

@ -169,11 +169,6 @@ namespace OpenSim.Framework.Servers.HttpServer
if (req.HttpContext.IsSending()) if (req.HttpContext.IsSending())
{ {
if ((Environment.TickCount - req.RequestTime) > req.PollServiceArgs.TimeOutms)
{
req.PollServiceArgs.Drop(req.RequestID, req.PollServiceArgs.Id);
}
else
ReQueueEvent(req); ReQueueEvent(req);
continue; continue;
} }

7
OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
View File

@ -516,11 +516,11 @@ namespace OpenSim.Region.ClientStack.Linden
totalSize += EventHeader.Length; totalSize += EventHeader.Length;
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder(1024);
LLSDxmlEncode.AddEndArray(sb); // events array LLSDxmlEncode.AddEndArray(sb); // events array
LLSDxmlEncode.AddElem("id", thisID, sb); LLSDxmlEncode.AddElem("id", thisID, sb);
LLSDxmlEncode.AddEndMap(sb); LLSDxmlEncode.AddEndMap(sb);
element = Encoding.UTF8.GetBytes(LLSDxmlEncode.End(sb)); element = LLSDxmlEncode.EndToNBBytes(sb);
elements.Add(element); elements.Add(element);
totalSize += element.Length; totalSize += element.Length;
@ -531,8 +531,9 @@ namespace OpenSim.Region.ClientStack.Linden
//temporary //temporary
byte[] finalData = new byte[totalSize]; byte[] finalData = new byte[totalSize];
int dst = 0; int dst = 0;
foreach(byte[] src in elements) for(int i = 0; i < elements.Count; ++i)
{ {
byte[] src = elements[i];
Array.Copy(src, 0, finalData, dst, src.Length); Array.Copy(src, 0, finalData, dst, src.Length);
dst += src.Length; dst += src.Length;
} }