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

32
OpenSim/Addons/Groups/GroupsMessagingModule.cs
View File

@ -606,22 +606,22 @@ namespace OpenSim.Groups
if (eq != null)
{
eq.ChatterboxInvitation(
GroupID
, groupInfo.GroupName
, fromAgent
, msg.message
, AgentID
, msg.fromAgentName
, msg.dialog
, msg.timestamp
, msg.offline == 1
, (int)msg.ParentEstateID
, msg.Position
, 1
, new UUID(msg.imSessionID)
, msg.fromGroup
, OpenMetaverse.Utils.StringToBytes(groupInfo.GroupName)
);
GroupID
, groupInfo.GroupName
, fromAgent
, msg.message
, AgentID
, msg.fromAgentName
, msg.dialog
, msg.timestamp
, msg.offline == 1
, (int)msg.ParentEstateID
, msg.Position
, 1
, new UUID(msg.imSessionID)
, msg.fromGroup
, OpenMetaverse.Utils.StringToBytes(groupInfo.GroupName)
);
var update = new GroupChatListAgentUpdateData(AgentID);
var updates = new List<GroupChatListAgentUpdateData> { update };

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

@ -169,12 +169,7 @@ namespace OpenSim.Framework.Servers.HttpServer
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;
}

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

@ -516,11 +516,11 @@ namespace OpenSim.Region.ClientStack.Linden
totalSize += EventHeader.Length;
StringBuilder sb = new StringBuilder();
StringBuilder sb = new StringBuilder(1024);
LLSDxmlEncode.AddEndArray(sb); // events array
LLSDxmlEncode.AddElem("id", thisID, sb);
LLSDxmlEncode.AddEndMap(sb);
element = Encoding.UTF8.GetBytes(LLSDxmlEncode.End(sb));
element = LLSDxmlEncode.EndToNBBytes(sb);
elements.Add(element);
totalSize += element.Length;
@ -531,8 +531,9 @@ namespace OpenSim.Region.ClientStack.Linden
//temporary
byte[] finalData = new byte[totalSize];
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);
dst += src.Length;
}