Merge branch 'master' into careminster

This commit is contained in:
Melanie
2010-01-03 21:43:39 +00:00
56 changed files with 1095 additions and 838 deletions

View File

@@ -1075,7 +1075,7 @@ namespace OpenSim.Framework
event SaveStateHandler OnSaveStateEvent;
event GroupAccountSummaryRequest OnGroupAccountSummaryRequest;
event GroupAccountDetailsRequest OnGroupAccountDetailsRequest;
event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest;
event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest;
event FreezeUserUpdate OnParcelFreezeUserEvent;
event EjectUserUpdate OnParcelEjectUserEvent;
event ParcelBuyPass OnParcelBuyPass;