aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
diff options
context:
space:
mode:
authorJohn Hurliman2010-01-12 10:27:21 -0800
committerJohn Hurliman2010-01-12 10:27:21 -0800
commita8b1a57cd11facdf2c5c583cfa766a44fe5f99c5 (patch)
treebf12b759e693d6b99494dfa19fb23e13488dd977 /OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
parentBug in llGetNumberOfPrims always returns to script when no clients are connec... (diff)
parentAdd the option to reject duplicate region names (diff)
downloadopensim-SC-a8b1a57cd11facdf2c5c583cfa766a44fe5f99c5.zip
opensim-SC-a8b1a57cd11facdf2c5c583cfa766a44fe5f99c5.tar.gz
opensim-SC-a8b1a57cd11facdf2c5c583cfa766a44fe5f99c5.tar.bz2
opensim-SC-a8b1a57cd11facdf2c5c583cfa766a44fe5f99c5.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs')
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs12
1 files changed, 10 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index daefd70..4a4c515 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -897,7 +897,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
897 { 897 {
898 } 898 }
899 899
900 public void SendEstateManagersList(UUID invoice, UUID[] EstateManagers, uint estateID) 900 public void SendEstateList(UUID invoice, int code, UUID[] Data, uint estateID)
901 { 901 {
902 } 902 }
903 903
@@ -1138,7 +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 }
1143
1144 public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes)
1145 {
1146 }
1147
1148 public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals)
1149 {
1142 } 1150 }
1143 } 1151 }
1144} 1152}