diff options
| author | Melanie | 2010-01-28 02:05:32 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-28 02:05:32 +0000 |
| commit | 6478bc9fb0279035ebd6be17e956f1e152e4e0a8 (patch) | |
| tree | 4c323beed42b93688ac6a545d8ae9c0507acef9e /OpenSim/Region | |
| parent | Changes WorldCommModule to ISharedRegionModule. (diff) | |
| parent | * .. More Endlines... (diff) | |
| download | opensim-SC_OLD-6478bc9fb0279035ebd6be17e956f1e152e4e0a8.zip opensim-SC_OLD-6478bc9fb0279035ebd6be17e956f1e152e4e0a8.tar.gz opensim-SC_OLD-6478bc9fb0279035ebd6be17e956f1e152e4e0a8.tar.bz2 opensim-SC_OLD-6478bc9fb0279035ebd6be17e956f1e152e4e0a8.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region')
3 files changed, 27 insertions, 27 deletions
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs index 1dfa1b1..0bd1a26 100644 --- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | |||
| @@ -1133,15 +1133,15 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
| 1133 | } | 1133 | } |
| 1134 | 1134 | ||
| 1135 | public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt) | 1135 | public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt) |
| 1136 | { | 1136 | { |
| 1137 | } | 1137 | } |
| 1138 | 1138 | ||
| 1139 | public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes) | 1139 | public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes) |
| 1140 | { | 1140 | { |
| 1141 | } | 1141 | } |
| 1142 | 1142 | ||
| 1143 | public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals) | 1143 | public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals) |
| 1144 | { | 1144 | { |
| 1145 | } | 1145 | } |
| 1146 | } | 1146 | } |
| 1147 | } | 1147 | } |
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index 6785c08..b421623 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 | } |
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index 4a4c515..1d15552 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
| @@ -1138,15 +1138,15 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
| 1138 | } | 1138 | } |
| 1139 | 1139 | ||
| 1140 | public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt) | 1140 | public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt) |
| 1141 | { | 1141 | { |
| 1142 | } | 1142 | } |
| 1143 | 1143 | ||
| 1144 | public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes) | 1144 | public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes) |
| 1145 | { | 1145 | { |
| 1146 | } | 1146 | } |
| 1147 | 1147 | ||
| 1148 | public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals) | 1148 | public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals) |
| 1149 | { | 1149 | { |
| 1150 | } | 1150 | } |
| 1151 | } | 1151 | } |
| 1152 | } | 1152 | } |