diff options
author | Melanie | 2010-01-16 00:05:08 +0000 |
---|---|---|
committer | Melanie | 2010-01-16 00:05:08 +0000 |
commit | 10f8c2ea9b67158c32b361f9652d503ea48de292 (patch) | |
tree | be0d88bc4b6df3825a0d27f62a08170d7c7ad262 /OpenSim/Framework/IClientAPI.cs | |
parent | Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/open... (diff) | |
parent | Add "create user" instructions to README.txt (diff) | |
download | opensim-SC_OLD-10f8c2ea9b67158c32b361f9652d503ea48de292.zip opensim-SC_OLD-10f8c2ea9b67158c32b361f9652d503ea48de292.tar.gz opensim-SC_OLD-10f8c2ea9b67158c32b361f9652d503ea48de292.tar.bz2 opensim-SC_OLD-10f8c2ea9b67158c32b361f9652d503ea48de292.tar.xz |
Merge branch 'master' into presence-refactor
This merge was very conflicted. I think I got them all, but I can't be sure.
I had to merge to master or risk divergence to the point of unmergeability.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 60c1ac7..3489af1 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -467,7 +467,7 @@ namespace OpenSim.Framework | |||
467 | 467 | ||
468 | public delegate void EjectUserUpdate(IClientAPI client, UUID parcelowner,uint flags, UUID target); | 468 | public delegate void EjectUserUpdate(IClientAPI client, UUID parcelowner,uint flags, UUID target); |
469 | 469 | ||
470 | public delegate void NewUserReport(IClientAPI client, string regionName,UUID abuserID, byte catagory, byte checkflags, string details, UUID objectID, Vector3 postion, byte reportType ,UUID screenshotID, string summery, UUID reporter); | 470 | public delegate void NewUserReport(IClientAPI client, string regionName,UUID abuserID, byte catagory, byte checkflags, string details, UUID objectID, Vector3 postion, byte reportType ,UUID screenshotID, string Summary, UUID reporter); |
471 | 471 | ||
472 | public delegate void GodUpdateRegionInfoUpdate(IClientAPI client, float BillableFactor, ulong EstateID, ulong RegionFlags, byte[] SimName,int RedirectX, int RedirectY); | 472 | public delegate void GodUpdateRegionInfoUpdate(IClientAPI client, float BillableFactor, ulong EstateID, ulong RegionFlags, byte[] SimName,int RedirectX, int RedirectY); |
473 | 473 | ||
@@ -1069,25 +1069,25 @@ namespace OpenSim.Framework | |||
1069 | 1069 | ||
1070 | event PlacesQuery OnPlacesQuery; | 1070 | event PlacesQuery OnPlacesQuery; |
1071 | 1071 | ||
1072 | event FindAgentUpdate OnFindAgentEvent; | 1072 | event FindAgentUpdate OnFindAgent; |
1073 | event TrackAgentUpdate OnTrackAgentEvent; | 1073 | event TrackAgentUpdate OnTrackAgent; |
1074 | event NewUserReport OnUserReportEvent; | 1074 | event NewUserReport OnUserReport; |
1075 | event SaveStateHandler OnSaveStateEvent; | 1075 | event SaveStateHandler OnSaveState; |
1076 | event GroupAccountSummaryRequest OnGroupAccountSummaryRequest; | 1076 | event GroupAccountSummaryRequest OnGroupAccountSummaryRequest; |
1077 | event GroupAccountDetailsRequest OnGroupAccountDetailsRequest; | 1077 | event GroupAccountDetailsRequest OnGroupAccountDetailsRequest; |
1078 | event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest; | 1078 | event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest; |
1079 | event FreezeUserUpdate OnParcelFreezeUserEvent; | 1079 | event FreezeUserUpdate OnParcelFreezeUser; |
1080 | event EjectUserUpdate OnParcelEjectUserEvent; | 1080 | event EjectUserUpdate OnParcelEjectUser; |
1081 | event ParcelBuyPass OnParcelBuyPass; | 1081 | event ParcelBuyPass OnParcelBuyPass; |
1082 | event ParcelGodMark OnParcelGodMark; | 1082 | event ParcelGodMark OnParcelGodMark; |
1083 | event GroupActiveProposalsRequest OnGroupActiveProposalsRequest; | 1083 | event GroupActiveProposalsRequest OnGroupActiveProposalsRequest; |
1084 | event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; | 1084 | event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; |
1085 | event SimWideDeletesDelegate OnSimWideDeletes; | 1085 | event SimWideDeletesDelegate OnSimWideDeletes; |
1086 | event SendPostcard OnSendPostcard; | 1086 | event SendPostcard OnSendPostcard; |
1087 | event MuteListEntryUpdate OnUpdateMuteListEntryEvent; | 1087 | event MuteListEntryUpdate OnUpdateMuteListEntry; |
1088 | event MuteListEntryRemove OnRemoveMuteListEntryEvent; | 1088 | event MuteListEntryRemove OnRemoveMuteListEntry; |
1089 | event GodlikeMessage onGodlikeMessageEvent; | 1089 | event GodlikeMessage onGodlikeMessage; |
1090 | event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent; | 1090 | event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate; |
1091 | 1091 | ||
1092 | /// <summary> | 1092 | /// <summary> |
1093 | /// Set the debug level at which packet output should be printed to console. | 1093 | /// Set the debug level at which packet output should be printed to console. |
@@ -1271,7 +1271,7 @@ namespace OpenSim.Framework | |||
1271 | void SendHealth(float health); | 1271 | void SendHealth(float health); |
1272 | 1272 | ||
1273 | 1273 | ||
1274 | void SendEstateManagersList(UUID invoice, UUID[] EstateManagers, uint estateID); | 1274 | void SendEstateList(UUID invoice, int code, UUID[] Data, uint estateID); |
1275 | 1275 | ||
1276 | void SendBannedUserList(UUID invoice, EstateBan[] banlist, uint estateID); | 1276 | void SendBannedUserList(UUID invoice, EstateBan[] banlist, uint estateID); |
1277 | 1277 | ||
@@ -1446,7 +1446,12 @@ namespace OpenSim.Framework | |||
1446 | void SendUserInfoReply(bool imViaEmail, bool visible, string email); | 1446 | void SendUserInfoReply(bool imViaEmail, bool visible, string email); |
1447 | 1447 | ||
1448 | void SendUseCachedMuteList(); | 1448 | void SendUseCachedMuteList(); |
1449 | void SendMuteListUpdate(string filename); | 1449 | |
1450 | void SendMuteListUpdate(string filename); | ||
1451 | |||
1452 | void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals); | ||
1453 | |||
1454 | void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes); | ||
1450 | 1455 | ||
1451 | void KillEndDone(); | 1456 | void KillEndDone(); |
1452 | 1457 | ||