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/Region/OptionalModules/Agent | |
| parent | Some merge fixups (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-2d9b69c186238c7b5e578189f17ee0ab24dd3bb4.zip opensim-SC-2d9b69c186238c7b5e578189f17ee0ab24dd3bb4.tar.gz opensim-SC-2d9b69c186238c7b5e578189f17ee0ab24dd3bb4.tar.bz2 opensim-SC-2d9b69c186238c7b5e578189f17ee0ab24dd3bb4.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/OptionalModules/Agent')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index f966376..cc38a30 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
| @@ -1657,15 +1657,15 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
| 1657 | } | 1657 | } |
| 1658 | 1658 | ||
| 1659 | public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt) | 1659 | public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt) |
| 1660 | { | 1660 | { |
| 1661 | } | 1661 | } |
| 1662 | 1662 | ||
| 1663 | public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes) | 1663 | public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes) |
| 1664 | { | 1664 | { |
| 1665 | } | 1665 | } |
| 1666 | 1666 | ||
| 1667 | public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals) | 1667 | public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals) |
| 1668 | { | 1668 | { |
| 1669 | } | 1669 | } |
| 1670 | } | 1670 | } |
| 1671 | } | 1671 | } |