diff options
| author | Justin Clark-Casey (justincc) | 2012-02-03 23:48:12 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-02-03 23:48:12 +0000 |
| commit | 2b6c5fcb3115fa6b963a536f34bd4a4a1a64c598 (patch) | |
| tree | 95acd2d2fc13dd77637549d8ce1f0ba78d4eb10d /OpenSim/Tests/Common | |
| parent | Change SceneObjectSerializer to use common ExternalRepresentationUtils.Execut... (diff) | |
| parent | Merge branch 'master' of ssh://snoopy@opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-2b6c5fcb3115fa6b963a536f34bd4a4a1a64c598.zip opensim-SC_OLD-2b6c5fcb3115fa6b963a536f34bd4a4a1a64c598.tar.gz opensim-SC_OLD-2b6c5fcb3115fa6b963a536f34bd4a4a1a64c598.tar.bz2 opensim-SC_OLD-2b6c5fcb3115fa6b963a536f34bd4a4a1a64c598.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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 4d3d257..14c1287 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
| @@ -972,7 +972,7 @@ namespace OpenSim.Tests.Common.Mock | |||
| 972 | { | 972 | { |
| 973 | } | 973 | } |
| 974 | 974 | ||
| 975 | public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, string abuseEmail, UUID estateOwner) | 975 | public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, uint covenantChanged, string abuseEmail, UUID estateOwner) |
| 976 | { | 976 | { |
| 977 | } | 977 | } |
| 978 | 978 | ||