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/Tests/Common | |
| 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/Tests/Common')
| -rw-r--r-- | OpenSim/Tests/Common/Mock/TestClient.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index d5de2a8..cf8e99d 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
| @@ -1194,14 +1194,14 @@ namespace OpenSim.Tests.Common.Mock | |||
| 1194 | 1194 | ||
| 1195 | public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt) | 1195 | public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt) |
| 1196 | { | 1196 | { |
| 1197 | } | 1197 | } |
| 1198 | 1198 | ||
| 1199 | public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes) | 1199 | public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes) |
| 1200 | { | 1200 | { |
| 1201 | } | 1201 | } |
| 1202 | 1202 | ||
| 1203 | public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals) | 1203 | public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals) |
| 1204 | { | 1204 | { |
| 1205 | } | 1205 | } |
| 1206 | } | 1206 | } |
| 1207 | } | 1207 | } |