Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-08-23 23:55:15 +01:00
22 changed files with 126 additions and 287 deletions

View File

@@ -2743,7 +2743,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
DirPlacesReplyPacket.StatusDataBlock[] status =
new DirPlacesReplyPacket.StatusDataBlock[0];
int i = 0;
foreach (DirPlacesReplyData d in data)
{
int idx = replies.Length;
@@ -2779,7 +2778,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
replies = new DirPlacesReplyPacket.QueryRepliesBlock[0];
status = new DirPlacesReplyPacket.StatusDataBlock[0];
}
}