diff options
author | Melanie | 2010-01-04 21:41:33 +0000 |
---|---|---|
committer | Melanie | 2010-01-04 21:41:33 +0000 |
commit | 7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc (patch) | |
tree | badbb6fd767ff6127c28d339677febd9356d80b0 /OpenSim/Region/OptionalModules/World/NPC | |
parent | Forgot to add these to the grid configs, so that logins work. (diff) | |
parent | Finish conversion if XInventoryService (diff) | |
download | opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.zip opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.gz opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.bz2 opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.xz |
Merge branch 'master' into presence-refactor
Diffstat (limited to 'OpenSim/Region/OptionalModules/World/NPC')
-rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index da7f018..e3392c8 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
@@ -381,24 +381,24 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
381 | public event PlacesQuery OnPlacesQuery; | 381 | public event PlacesQuery OnPlacesQuery; |
382 | 382 | ||
383 | public event FindAgentUpdate OnFindAgentEvent; | 383 | public event FindAgentUpdate OnFindAgentEvent; |
384 | public event TrackAgentUpdate OnTrackAgentEvent; | 384 | public event TrackAgentUpdate OnTrackAgentEvent; |
385 | public event NewUserReport OnUserReportEvent; | 385 | public event NewUserReport OnUserReportEvent; |
386 | public event SaveStateHandler OnSaveStateEvent; | 386 | public event SaveStateHandler OnSaveStateEvent; |
387 | public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest; | 387 | public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest; |
388 | public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest; | 388 | public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest; |
389 | public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest; | 389 | public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest; |
390 | public event FreezeUserUpdate OnParcelFreezeUserEvent; | 390 | public event FreezeUserUpdate OnParcelFreezeUserEvent; |
391 | public event EjectUserUpdate OnParcelEjectUserEvent; | 391 | public event EjectUserUpdate OnParcelEjectUserEvent; |
392 | public event ParcelBuyPass OnParcelBuyPass; | 392 | public event ParcelBuyPass OnParcelBuyPass; |
393 | public event ParcelGodMark OnParcelGodMark; | 393 | public event ParcelGodMark OnParcelGodMark; |
394 | public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest; | 394 | public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest; |
395 | public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; | 395 | public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; |
396 | public event SimWideDeletesDelegate OnSimWideDeletes; | 396 | public event SimWideDeletesDelegate OnSimWideDeletes; |
397 | public event SendPostcard OnSendPostcard; | 397 | public event SendPostcard OnSendPostcard; |
398 | public event MuteListEntryUpdate OnUpdateMuteListEntryEvent; | 398 | public event MuteListEntryUpdate OnUpdateMuteListEntryEvent; |
399 | public event MuteListEntryRemove OnRemoveMuteListEntryEvent; | 399 | public event MuteListEntryRemove OnRemoveMuteListEntryEvent; |
400 | public event GodlikeMessage onGodlikeMessageEvent; | 400 | public event GodlikeMessage onGodlikeMessageEvent; |
401 | public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent; | 401 | public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent; |
402 | 402 | ||
403 | #pragma warning restore 67 | 403 | #pragma warning restore 67 |
404 | 404 | ||