Merge branch 'master' into careminster

This commit is contained in:
Melanie
2010-01-28 02:07:18 +00:00
10 changed files with 72 additions and 68 deletions

View File

@@ -1447,10 +1447,10 @@ namespace OpenSim.Framework
void SendUseCachedMuteList();
void SendMuteListUpdate(string filename);
void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals);
void SendMuteListUpdate(string filename);
void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals);
void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes);
void KillEndDone();