Backport r9911 patch to stable

0.6.5-post-fixes
Melanie Thielker 2009-06-23 14:38:28 +00:00
parent 3769785d3c
commit 501df1ce2b
1 changed files with 42 additions and 36 deletions

View File

@ -8624,6 +8624,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
List<GroupMembersData> members = List<GroupMembersData> members =
m_GroupsModule.GroupMembersRequest(this, groupMembersRequestPacket.GroupData.GroupID); m_GroupsModule.GroupMembersRequest(this, groupMembersRequestPacket.GroupData.GroupID);
while (true)
{
GroupMembersReplyPacket groupMembersReply = (GroupMembersReplyPacket)PacketPool.Instance.GetPacket(PacketType.GroupMembersReply); GroupMembersReplyPacket groupMembersReply = (GroupMembersReplyPacket)PacketPool.Instance.GetPacket(PacketType.GroupMembersReply);
groupMembersReply.AgentData = groupMembersReply.AgentData =
@ -8641,9 +8643,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
groupMembersRequestPacket.GroupData.RequestID; groupMembersRequestPacket.GroupData.RequestID;
groupMembersReply.GroupData.MemberCount = members.Count; groupMembersReply.GroupData.MemberCount = members.Count;
int i = 0; for (int i = 0 ; i < 60 && members.Count > 0 ; i++)
foreach (GroupMembersData m in members)
{ {
GroupMembersData m = members[0];
members.RemoveAt(0);
groupMembersReply.MemberData[i] = groupMembersReply.MemberData[i] =
new GroupMembersReplyPacket.MemberDataBlock(); new GroupMembersReplyPacket.MemberDataBlock();
groupMembersReply.MemberData[i].AgentID = groupMembersReply.MemberData[i].AgentID =
@ -8660,8 +8664,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
m.IsOwner; m.IsOwner;
i++; i++;
} }
OutPacket(groupMembersReply, ThrottleOutPacketType.Task); OutPacket(groupMembersReply, ThrottleOutPacketType.Task);
if (members.Count == 0)
break;
}
} }
break; break;