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/Client/MXP/ClientStack | |
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/Client/MXP/ClientStack')
-rw-r--r-- | OpenSim/Client/MXP/ClientStack/MXPClientView.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs index 358a839..b6161ff 100644 --- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs +++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs | |||
@@ -1217,7 +1217,7 @@ namespace OpenSim.Client.MXP.ClientStack | |||
1217 | // Need to translate to MXP somehow | 1217 | // Need to translate to MXP somehow |
1218 | } | 1218 | } |
1219 | 1219 | ||
1220 | public void SendEstateManagersList(UUID invoice, UUID[] EstateManagers, uint estateID) | 1220 | public void SendEstateList(UUID invoice, int code, UUID[] Data, uint estateID) |
1221 | { | 1221 | { |
1222 | // Need to translate to MXP somehow | 1222 | // Need to translate to MXP somehow |
1223 | } | 1223 | } |