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

@@ -1271,7 +1271,7 @@ namespace OpenSim.Framework
void SendHealth(float health);
void SendEstateManagersList(UUID invoice, UUID[] EstateManagers, uint estateID);
void SendEstateList(UUID invoice, int code, UUID[] Data, uint estateID);
void SendBannedUserList(UUID invoice, EstateBan[] banlist, uint estateID);