diff options
| author | Melanie | 2010-01-28 02:07:18 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-28 02:07:18 +0000 |
| commit | 2d9b69c186238c7b5e578189f17ee0ab24dd3bb4 (patch) | |
| tree | d622a8f2ca6c1c3bf638c65ac05f1faa19fcc615 /OpenSim/Client/Sirikata/ClientStack | |
| parent | Some merge fixups (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-2d9b69c186238c7b5e578189f17ee0ab24dd3bb4.zip opensim-SC_OLD-2d9b69c186238c7b5e578189f17ee0ab24dd3bb4.tar.gz opensim-SC_OLD-2d9b69c186238c7b5e578189f17ee0ab24dd3bb4.tar.bz2 opensim-SC_OLD-2d9b69c186238c7b5e578189f17ee0ab24dd3bb4.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Client/Sirikata/ClientStack')
| -rw-r--r-- | OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs index aaa3de3..96a24c6 100644 --- a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs +++ b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs | |||
| @@ -1177,15 +1177,15 @@ namespace OpenSim.Client.Sirikata.ClientStack | |||
| 1177 | } | 1177 | } |
| 1178 | 1178 | ||
| 1179 | public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt) | 1179 | public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt) |
| 1180 | { | 1180 | { |
| 1181 | } | 1181 | } |
| 1182 | 1182 | ||
| 1183 | public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes) | 1183 | public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes) |
| 1184 | { | 1184 | { |
| 1185 | } | 1185 | } |
| 1186 | 1186 | ||
| 1187 | public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals) | 1187 | public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals) |
| 1188 | { | 1188 | { |
| 1189 | } | 1189 | } |
| 1190 | 1190 | ||
| 1191 | #endregion | 1191 | #endregion |