diff options
author | Melanie | 2010-01-09 14:21:50 +0000 |
---|---|---|
committer | Melanie | 2010-01-09 14:21:50 +0000 |
commit | a764eb5dc740c4b7056acad5058d2da0c9c9c740 (patch) | |
tree | a1014fb5828a32f3355d0cb37a3ba7fce264dc05 /OpenSim/Framework/IClientAPI.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Add functionality to estate "Allowed Users" and "Allowed Groups". Allowed users (diff) | |
download | opensim-SC-a764eb5dc740c4b7056acad5058d2da0c9c9c740.zip opensim-SC-a764eb5dc740c4b7056acad5058d2da0c9c9c740.tar.gz opensim-SC-a764eb5dc740c4b7056acad5058d2da0c9c9c740.tar.bz2 opensim-SC-a764eb5dc740c4b7056acad5058d2da0c9c9c740.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Framework/IClientAPI.cs')
-rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 861d05e..55d416f 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -1271,7 +1271,7 @@ namespace OpenSim.Framework | |||
1271 | void SendHealth(float health); | 1271 | void SendHealth(float health); |
1272 | 1272 | ||
1273 | 1273 | ||
1274 | void SendEstateManagersList(UUID invoice, UUID[] EstateManagers, uint estateID); | 1274 | void SendEstateList(UUID invoice, int code, UUID[] Data, uint estateID); |
1275 | 1275 | ||
1276 | void SendBannedUserList(UUID invoice, EstateBan[] banlist, uint estateID); | 1276 | void SendBannedUserList(UUID invoice, EstateBan[] banlist, uint estateID); |
1277 | 1277 | ||