diff options
| author | Justin Clark-Casey (justincc) | 2011-03-29 23:08:44 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-03-29 23:08:44 +0100 |
| commit | f754dedbef45097910f3977ca22e9afaaaed9196 (patch) | |
| tree | 88f2119ec41194436baae80c974795f4083f0944 /OpenSim/Client | |
| parent | Improvement over 2 commits ago: make the hyperlink check understand port 80. (diff) | |
| parent | disable prim count debug logging temporarily (diff) | |
| download | opensim-SC-f754dedbef45097910f3977ca22e9afaaaed9196.zip opensim-SC-f754dedbef45097910f3977ca22e9afaaaed9196.tar.gz opensim-SC-f754dedbef45097910f3977ca22e9afaaaed9196.tar.bz2 opensim-SC-f754dedbef45097910f3977ca22e9afaaaed9196.tar.xz | |
Merge branch 'primcounts'
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 1d93382..93c6c98 100644 --- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs +++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs | |||
| @@ -1252,7 +1252,7 @@ namespace OpenSim.Client.MXP.ClientStack | |||
| 1252 | // Need to translate to MXP somehow | 1252 | // Need to translate to MXP somehow |
| 1253 | } | 1253 | } |
| 1254 | 1254 | ||
| 1255 | public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) | 1255 | public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, ILandObject lo, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) |
| 1256 | { | 1256 | { |
| 1257 | // Need to translate to MXP somehow | 1257 | // Need to translate to MXP somehow |
| 1258 | } | 1258 | } |
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs index f2b58d3..fc27f01 100644 --- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs +++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs | |||
| @@ -799,7 +799,7 @@ namespace OpenSim.Client.VWoHTTP.ClientStack | |||
| 799 | throw new System.NotImplementedException(); | 799 | throw new System.NotImplementedException(); |
| 800 | } | 800 | } |
| 801 | 801 | ||
| 802 | public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) | 802 | public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, ILandObject lo, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) |
| 803 | { | 803 | { |
| 804 | throw new System.NotImplementedException(); | 804 | throw new System.NotImplementedException(); |
| 805 | } | 805 | } |