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/Tests/Common | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Add functionality to estate "Allowed Users" and "Allowed Groups". Allowed users (diff) | |
| download | opensim-SC_OLD-a764eb5dc740c4b7056acad5058d2da0c9c9c740.zip opensim-SC_OLD-a764eb5dc740c4b7056acad5058d2da0c9c9c740.tar.gz opensim-SC_OLD-a764eb5dc740c4b7056acad5058d2da0c9c9c740.tar.bz2 opensim-SC_OLD-a764eb5dc740c4b7056acad5058d2da0c9c9c740.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Tests/Common')
| -rw-r--r-- | OpenSim/Tests/Common/Mock/TestClient.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index 8c4eb3f..d5de2a8 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
| @@ -924,7 +924,7 @@ namespace OpenSim.Tests.Common.Mock | |||
| 924 | { | 924 | { |
| 925 | } | 925 | } |
| 926 | 926 | ||
| 927 | public void SendEstateManagersList(UUID invoice, UUID[] EstateManagers, uint estateID) | 927 | public void SendEstateList(UUID invoice, int code, UUID[] Data, uint estateID) |
| 928 | { | 928 | { |
| 929 | } | 929 | } |
| 930 | 930 | ||