diff options
| author | Melanie | 2011-04-01 07:44:43 +0100 |
|---|---|---|
| committer | Melanie | 2011-04-01 07:44:43 +0100 |
| commit | 329fa73695b496a30e9192888371855802769a16 (patch) | |
| tree | f581712c3317119b70005beecbe7e4a8d86fb6bc /OpenSim/Tests | |
| parent | Make the login service's call to the sim time out quicker so we have a (diff) | |
| parent | When a new parcel is created, make sure the prim counts are updated. (diff) | |
| download | opensim-SC_OLD-329fa73695b496a30e9192888371855802769a16.zip opensim-SC_OLD-329fa73695b496a30e9192888371855802769a16.tar.gz opensim-SC_OLD-329fa73695b496a30e9192888371855802769a16.tar.bz2 opensim-SC_OLD-329fa73695b496a30e9192888371855802769a16.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
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 7b7d66e..d1b4feb 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
| @@ -961,7 +961,7 @@ namespace OpenSim.Tests.Common.Mock | |||
| 961 | { | 961 | { |
| 962 | } | 962 | } |
| 963 | 963 | ||
| 964 | public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) | 964 | public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, ILandObject lo, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) |
| 965 | { | 965 | { |
| 966 | } | 966 | } |
| 967 | 967 | ||