aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Client/Sirikata/ClientStack
diff options
context:
space:
mode:
authorMelanie2009-12-31 23:30:41 +0000
committerMelanie2009-12-31 23:30:41 +0000
commit872387d278d5eaeb2bc118b76d5eb47a9c0dcaf5 (patch)
treec17034093b35b661105b7de15f00e0522196f932 /OpenSim/Client/Sirikata/ClientStack
parentMerge branch 'presence-refactor' of melanie@opensimulator.org:/var/git/opensi... (diff)
parentReadds llCollisionFilter and adds llPassCollision. (diff)
downloadopensim-SC_OLD-872387d278d5eaeb2bc118b76d5eb47a9c0dcaf5.zip
opensim-SC_OLD-872387d278d5eaeb2bc118b76d5eb47a9c0dcaf5.tar.gz
opensim-SC_OLD-872387d278d5eaeb2bc118b76d5eb47a9c0dcaf5.tar.bz2
opensim-SC_OLD-872387d278d5eaeb2bc118b76d5eb47a9c0dcaf5.tar.xz
Merge branch 'master' into presence-refactor
Diffstat (limited to 'OpenSim/Client/Sirikata/ClientStack')
-rw-r--r--OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs31
1 files changed, 31 insertions, 0 deletions
diff --git a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
index e8d1889..75b2347 100644
--- a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
+++ b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
@@ -374,6 +374,25 @@ namespace OpenSim.Client.Sirikata.ClientStack
374 public event GrantUserFriendRights OnGrantUserRights; 374 public event GrantUserFriendRights OnGrantUserRights;
375 public event MuteListRequest OnMuteListRequest; 375 public event MuteListRequest OnMuteListRequest;
376 public event PlacesQuery OnPlacesQuery; 376 public event PlacesQuery OnPlacesQuery;
377 public event FindAgentUpdate OnFindAgentEvent;
378 public event TrackAgentUpdate OnTrackAgentEvent;
379 public event NewUserReport OnUserReportEvent;
380 public event SaveStateHandler OnSaveStateEvent;
381 public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest;
382 public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest;
383 public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest;
384 public event FreezeUserUpdate OnParcelFreezeUserEvent;
385 public event EjectUserUpdate OnParcelEjectUserEvent;
386 public event ParcelBuyPass OnParcelBuyPass;
387 public event ParcelGodMark OnParcelGodMark;
388 public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest;
389 public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
390 public event SimWideDeletesDelegate OnSimWideDeletes;
391 public event SendPostcard OnSendPostcard;
392 public event MuteListEntryUpdate OnUpdateMuteListEntryEvent;
393 public event MuteListEntryRemove OnRemoveMuteListEntryEvent;
394 public event GodlikeMessage onGodlikeMessageEvent;
395 public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent;
377 public void SetDebugPacketLevel(int newDebug) 396 public void SetDebugPacketLevel(int newDebug)
378 { 397 {
379 throw new System.NotImplementedException(); 398 throw new System.NotImplementedException();
@@ -1121,6 +1140,18 @@ namespace OpenSim.Client.Sirikata.ClientStack
1121 { 1140 {
1122 throw new System.NotImplementedException(); 1141 throw new System.NotImplementedException();
1123 } 1142 }
1143
1144 public void SendGroupAccountingDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID, int amt)
1145 {
1146 }
1147
1148 public void SendGroupAccountingSummary(IClientAPI sender,UUID groupID, uint moneyAmt, int totalTier, int usedTier)
1149 {
1150 }
1151
1152 public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt)
1153 {
1154 }
1124 1155
1125 #endregion 1156 #endregion
1126 } 1157 }