aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/World
diff options
context:
space:
mode:
authorMelanie2010-01-28 02:05:32 +0000
committerMelanie2010-01-28 02:05:32 +0000
commit6478bc9fb0279035ebd6be17e956f1e152e4e0a8 (patch)
tree4c323beed42b93688ac6a545d8ae9c0507acef9e /OpenSim/Region/OptionalModules/World
parentChanges WorldCommModule to ISharedRegionModule. (diff)
parent* .. More Endlines... (diff)
downloadopensim-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/OptionalModules/World')
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs18
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 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}