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/World | |
| 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/Region/OptionalModules/World')
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index 23398f7..3135cdc 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 | } |