diff options
| author | Melanie | 2012-02-04 11:48:20 +0000 |
|---|---|---|
| committer | Melanie | 2012-02-04 11:48:20 +0000 |
| commit | ce5e900721cb0447f76bcb198faf5f7c31eeaf6e (patch) | |
| tree | c906a2b8858f9c590e39e2a26f47017fd7b6b9c6 /OpenSim/Tests | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Add default value to TelehubObject (diff) | |
| download | opensim-SC_OLD-ce5e900721cb0447f76bcb198faf5f7c31eeaf6e.zip opensim-SC_OLD-ce5e900721cb0447f76bcb198faf5f7c31eeaf6e.tar.gz opensim-SC_OLD-ce5e900721cb0447f76bcb198faf5f7c31eeaf6e.tar.bz2 opensim-SC_OLD-ce5e900721cb0447f76bcb198faf5f7c31eeaf6e.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/Resources/RegionStore.migrations
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
Diffstat (limited to 'OpenSim/Tests')
| -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 c32dbf5..fa750ab 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
| @@ -977,7 +977,7 @@ namespace OpenSim.Tests.Common.Mock | |||
| 977 | { | 977 | { |
| 978 | } | 978 | } |
| 979 | 979 | ||
| 980 | public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, string abuseEmail, UUID estateOwner) | 980 | public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, uint covenantChanged, string abuseEmail, UUID estateOwner) |
| 981 | { | 981 | { |
| 982 | } | 982 | } |
| 983 | 983 | ||