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/Examples | |
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/Examples')
-rw-r--r-- | OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs index 086103b..27fad61 100644 --- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | |||
@@ -275,24 +275,24 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
275 | public event PlacesQuery OnPlacesQuery; | 275 | public event PlacesQuery OnPlacesQuery; |
276 | 276 | ||
277 | public event FindAgentUpdate OnFindAgentEvent; | 277 | public event FindAgentUpdate OnFindAgentEvent; |
278 | public event TrackAgentUpdate OnTrackAgentEvent; | 278 | public event TrackAgentUpdate OnTrackAgentEvent; |
279 | public event NewUserReport OnUserReportEvent; | 279 | public event NewUserReport OnUserReportEvent; |
280 | public event SaveStateHandler OnSaveStateEvent; | 280 | public event SaveStateHandler OnSaveStateEvent; |
281 | public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest; | 281 | public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest; |
282 | public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest; | 282 | public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest; |
283 | public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest; | 283 | public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest; |
284 | public event FreezeUserUpdate OnParcelFreezeUserEvent; | 284 | public event FreezeUserUpdate OnParcelFreezeUserEvent; |
285 | public event EjectUserUpdate OnParcelEjectUserEvent; | 285 | public event EjectUserUpdate OnParcelEjectUserEvent; |
286 | public event ParcelBuyPass OnParcelBuyPass; | 286 | public event ParcelBuyPass OnParcelBuyPass; |
287 | public event ParcelGodMark OnParcelGodMark; | 287 | public event ParcelGodMark OnParcelGodMark; |
288 | public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest; | 288 | public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest; |
289 | public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; | 289 | public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; |
290 | public event SimWideDeletesDelegate OnSimWideDeletes; | 290 | public event SimWideDeletesDelegate OnSimWideDeletes; |
291 | public event SendPostcard OnSendPostcard; | 291 | public event SendPostcard OnSendPostcard; |
292 | public event MuteListEntryUpdate OnUpdateMuteListEntryEvent; | 292 | public event MuteListEntryUpdate OnUpdateMuteListEntryEvent; |
293 | public event MuteListEntryRemove OnRemoveMuteListEntryEvent; | 293 | public event MuteListEntryRemove OnRemoveMuteListEntryEvent; |
294 | public event GodlikeMessage onGodlikeMessageEvent; | 294 | public event GodlikeMessage onGodlikeMessageEvent; |
295 | public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent; | 295 | public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent; |
296 | 296 | ||
297 | #pragma warning restore 67 | 297 | #pragma warning restore 67 |
298 | 298 | ||