Merge branch 'master' into careminster

This commit is contained in:
Melanie
2010-01-09 14:21:50 +00:00
11 changed files with 209 additions and 120 deletions

View File

@@ -1217,7 +1217,7 @@ namespace OpenSim.Client.MXP.ClientStack
// Need to translate to MXP somehow
}
public void SendEstateManagersList(UUID invoice, UUID[] EstateManagers, uint estateID)
public void SendEstateList(UUID invoice, int code, UUID[] Data, uint estateID)
{
// Need to translate to MXP somehow
}