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/Client | |
| 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/Client')
| -rw-r--r-- | OpenSim/Client/MXP/ClientStack/MXPClientView.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs index 302f7ae..ca7566e 100644 --- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs +++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs | |||
| @@ -1267,7 +1267,7 @@ namespace OpenSim.Client.MXP.ClientStack | |||
| 1267 | // Need to translate to MXP somehow | 1267 | // Need to translate to MXP somehow |
| 1268 | } | 1268 | } |
| 1269 | 1269 | ||
| 1270 | public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) | 1270 | public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, ILandObject lo, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) |
| 1271 | { | 1271 | { |
| 1272 | // Need to translate to MXP somehow | 1272 | // Need to translate to MXP somehow |
| 1273 | } | 1273 | } |
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs index ba6456b..120e2ea 100644 --- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs +++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs | |||
| @@ -805,7 +805,7 @@ namespace OpenSim.Client.VWoHTTP.ClientStack | |||
| 805 | throw new System.NotImplementedException(); | 805 | throw new System.NotImplementedException(); |
| 806 | } | 806 | } |
| 807 | 807 | ||
| 808 | public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) | 808 | public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, ILandObject lo, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) |
| 809 | { | 809 | { |
| 810 | throw new System.NotImplementedException(); | 810 | throw new System.NotImplementedException(); |
| 811 | } | 811 | } |